Commit Graph
235 Commits
Author SHA1 Message Date
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
gnembon 95bac227a0 Merge branch 'master' into 1.17 2021-01-13 21:36:05 -04:00
Andrew S df20f9e4e4 Add the lightEngineMaxBatchSize rule (#654)
* Apply light batch sizes after start region has been created

* Add light batch rules
2021-01-13 21:07:42 -04:00
gnembon 0453dc33a0 Merge branch 'master' into 1.17
# Conflicts:
#	gradle.properties
2021-01-13 18:19:51 -04:00
gnembon b362c46056 1.4.22, proven support for 1.16.5-pre1 2021-01-13 18:18:11 -04:00
gnembon 32d0ba9694 20w51a 2020-12-16 19:06:09 -04:00
gnembon c2436f1f09 Merge branch 'master' into 1.17 2020-12-16 18:04:52 -04:00
gnembon c6529c3d3c 1.4.21 2020-12-16 18:03:04 -04:00
gnembon 02a25c0c99 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/api/Entities.java
2020-12-07 01:14:12 -04:00
gnembon e8a6b8936f as per discussion, since scripts can now be stowed in the global bin, it makes sense for apps to behave like datapacks. fixes #613 2020-12-07 00:32:08 -04:00
gnembon 1c39914f4f Merge branch 'master' into 1.17 2020-12-02 18:21:25 -04:00
gnembon 632d7c3268 1.4.20 2020-12-02 18:15:26 -04:00
gnembon 3ea5190fd6 Merge branch 'master' into 1.17 2020-11-29 15:54:54 -04:00
gnembon f9bce2b50e set default ops requirement for commands that can change world or cause significant impact on the world. fixed #584
spawn
tick
draw
player
track
2020-11-29 15:12:29 -04:00
gnembon 8a95db6400 Merge branch 'master' into 1.17 2020-11-25 19:09:57 -04:00
gnembon dd9d6659fb 1.4.19 2020-11-25 19:08:33 -04:00
gnembon 253604b34a Merge branch 'master' into 1.17 2020-11-25 02:12:41 -04:00
Ghoulboyandaltrisi aeb3e382a6 Replacing draw and distance with apps (#553)
* added draw.sc app

Now working on distance app

* Adding apps as carpet rules

* adding distance app

Co-authored-by: altrisi <altrisi.trillosierra@gmail.com>
2020-11-24 19:40:55 -04:00
gnembon 2d7ce5dccd Merge branch 'master' into 1.17 2020-11-21 07:02:20 -04:00
gnembon 8e3c330e04 1.4.18 2020-11-21 06:46:20 -04:00
gnembon ecca8d44f1 temp fix 2020-11-15 23:10:12 -04:00
gnembon c7a96aa219 1.4.17 verbump 2020-11-11 16:07:02 -04:00
gnembon 116b2caa41 1.4.16 2020-11-06 00:24:24 -04:00
gnembon 79dc85274d revert some app changes preparing for release of 1.17 2020-11-04 20:11:21 -04:00
gnembon 741edf1465 three things:
- logger is carpet, fixes #522
 - fixed fancy commands to functions - so could be used later with lambdas and functions that use different argument names
 - moved a few builtin apps to commands via /carpet
2020-11-03 04:45:08 -04:00