Commit Graph
259 Commits
Author SHA1 Message Date
gnembon 7780a3276d Merge branch 'master' into 1.17 2021-05-05 20:20:48 -03:00
gnembon 7063d542ff 1.4.35 2021-05-05 20:19:18 -03:00
gnembon 820c9b6489 Merge branch 'master' into 1.17 2021-05-05 01:31:00 -03:00
gnembon 8d97ab26a9 script compile time optimizations. 2021-05-05 00:25:31 -03:00
gnembon 624f9973c8 Merge branch 'master' into 1.17 2021-04-28 16:50:45 -03:00
gnembon f8c3de21d3 1.4.34 2021-04-28 16:48:46 -03:00
gnembon cd6827767a Merge branch 'master' into 1.17 2021-04-21 18:42:50 -03:00
gnembon 8c9dabdbbc 1.4.33 2021-04-21 18:41:39 -03:00
gnembon 2612dff497 Merge branch 'master' into 1.17 2021-04-14 15:07:15 -03:00
gnembon 1a96737cff 1.4.32 2021-04-14 14:35:49 -03:00
replaceitemandgnembon c878ffd637 Added renewableDeepslate (#806)
* Added renewableDeepslate

* Check for stillness

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2021-04-13 10:44:49 -03:00
gnembon 8903865faa Merge branch 'master' into 1.17 2021-04-07 19:12:08 -03:00
gnembon e0eec1bb9c 1.4.31 2021-04-07 18:49:53 -03:00
gnembon 3756ca9f86 Merge branch 'master' into 1.17 2021-03-31 22:04:24 -03:00
gnembon 470821524d 1.4.30 foreal 2021-03-31 22:03:09 -03:00
gnembon 0320de5d6d 21w13a 2021-03-31 22:02:09 -03:00
gnembon e795a38b17 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java
2021-03-18 00:52:13 -03:00
gnembon 3156094719 1.4.30 2021-03-17 19:00:11 -03:00
gnembon a499c3cd68 Merge branch 'master' into 1.17 2021-03-10 23:16:36 -04:00
gnembon 4e168626dd 1.4.29 2021-03-10 23:15:03 -04:00
gnembon 5c4744a93b Merge branch 'master' into 1.17 2021-03-09 19:41:49 -04:00
altrisi b123899abd Fix run() with a locked SettingsManager (#755)
* Fix run() in locked SettingsManager

* Fix small security issue while I'm at it

* Notify command change
2021-03-07 17:14:35 -04:00
gnembon 34bfe32e39 Merge branch 'master' into 1.17 2021-03-02 08:48:46 -04:00
Andrew S 69a0eeed7d Add pingPlayerListLimit setting (#704)
* Update CarpetSettings.java

* Add pingPlayerListLimit

* Fix formatting & fail softer
2021-03-01 22:48:31 -04:00
gnembon 659c3ffa6e Merge branch 'master' into 1.17 2021-02-24 18:30:58 -04:00
gnembon 3c8d875bd0 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-02-24 18:28:57 -04:00
gnembon 9fc67bb026 Merge branch 'master' into 1.17 2021-02-24 18:27:43 -04:00
gnembon 841b3f5491 1.4.28 2021-02-24 18:27:31 -04:00
gnembon 3505138351 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/CarpetSettings.java
2021-02-24 20:41:06 -04:00
DragonEggBedrockBreakingandaltrisi eeddf96abc Update CarpetSettings.java
Co-authored-by: altrisi <altrisi.trillosierra@gmail.com>
2021-02-21 17:34:50 +00:00
DragonEggBedrockBreaking f7aa874ae8 Update CarpetSettings.java 2021-02-21 12:44:02 +00:00
gnembon 7029c6b9b9 Merge pull request #722 from fxmorin/master
Added Rule `lightningKillsDrops`
2021-02-18 22:17:37 -04:00
gnembon b61d69c904 Update src/main/java/carpet/CarpetSettings.java 2021-02-18 22:15:59 -04:00
gnembon fd84a5a6d0 making sure custom structure limits are always working. 2021-02-18 22:14:50 -04:00
FX 680916880e Added Rule lightningKillsDrops
Which fixes [MC-206922](https://bugs.mojang.com/browse/MC-206922)
2021-02-18 21:12:06 -05:00
gnembon d537faae98 restored structureBlockOutlineDistance 2021-02-17 23:36:11 -04:00
gnembon d2077c2fad Merge branch 'master' into 1.17 2021-02-17 20:17:07 -04:00
gnembon edd203a1f8 1.4.27 2021-02-17 19:52:58 -04:00
gnembon af5aae24cb Merge branch 'master' into 1.17 2021-02-17 12:56:17 -04:00
gnembon df7a4a6681 applying altrisi's observations. 2021-02-17 03:09:41 -04:00
gnembon cc697d159a Merge branch 'master' into 1.17 2021-02-10 23:37:42 -04:00
gnembon 23a7852141 1.4.26 2021-02-10 23:36:45 -04:00
gnembon 7309b33029 Merge branch 'master' into 1.17 2021-02-03 20:19:10 -04:00
gnembon 291393bb62 1.4.25 2021-02-03 20:18:05 -04:00
gnembon 71a8dcc31e Merge branch 'master' into 1.17 2021-01-26 05:42:20 -04:00
e32b37dcf1 Add three Structure Block related settings (#664)
* Added structureBlockOutlineDistance

* Added structureBlockIgnored

* Added structureBlockLimit

* Made structureBlockLimit work on dedicated server

* Correct packet contents check and fix mixin list

* Add limits to structure block settings, slight optimisation to ignored block

* Fixed the `structureBlockLimit` limit

* Update src/main/java/carpet/CarpetSettings.java

Co-authored-by: altrisi <altrisi.trillosierra@gmail.com>

* Fix missing imports and a typo

* Update src/main/java/carpet/CarpetSettings.java

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
Co-authored-by: altrisi <altrisi.trillosierra@gmail.com>
2021-01-22 23:38:10 -04:00
gnembon 42ea68e740 1.4.24 2021-01-20 22:54:11 -04:00
gnembon 1ee0301504 Merge branch 'master' into 1.17
# Conflicts:
#	gradle.properties
2021-01-20 22:55:10 -04:00
gnembon 981dcf6eaa Merge branch 'master' into 1.17
# Conflicts:
#	gradle.properties
2021-01-15 11:41:07 -04:00
gnembon 7a141affaf 1.16.5 at 1.4.23 2021-01-15 11:37:17 -04:00