Commit Graph
362 Commits
Author SHA1 Message Date
gnembon 336b1070a3 disable kelpGenerationGrowthlimit because its fixes the same way in core 2019-11-08 02:46:51 -04:00
gnembon ec19e37a74 19w45a 2019-11-07 16:13:15 -04:00
gnembon 24d4159f9f Merge branch 'dummy_enchants' into 1.15 2019-11-07 07:58:32 -04:00
gnembon ff8dc630c5 19w44a 2019-10-30 13:38:51 -03:00
gnembon fa3b119857 Merge branch 'master' into 1.15 2019-10-30 01:24:20 -03:00
gnembon 5bb959a853 falling blocks can also tick 2019-10-30 01:23:52 -03:00
gnembon f41ae0f00e Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/TntEntityMixin.java
#	src/main/java/carpet/script/value/EntityValue.java
2019-10-23 08:58:57 -03:00
gnembon 1226a940e9 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2019-10-23 08:50:03 -03:00
gnembon e21cbf5f59 remove markers when app unloads or not loaded 2019-10-23 08:49:58 -03:00
Joe 644203bf6c Surely the JVM should have caught this? 2019-10-23 04:57:51 +01:00
Joe df2ea4d2cc Add TNT rules 2019-10-23 04:53:34 +01:00
gnembon 2d7bfb25b3 renamed mixin trying to prevent colliding in the future 2019-10-22 20:31:52 -03:00
gnembon d008c38238 fixes to piston movement 2019-10-16 16:21:35 -03:00
gnembon bc9d0664cd restored some anti cheat things for elytra, still applicable 2019-10-16 15:48:14 -03:00
gnembon cb900f638f 19w42a 2019-10-16 15:00:53 -03:00
gnembon 89b3cd8352 removed honeyslime, 1.1.3 2019-10-16 09:42:53 -03:00
gnembon 6018f680b4 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java
2019-10-16 09:40:36 -03:00
gnembon 79e7bba04b restrict honey rule to 1.14 only 2019-10-16 09:38:47 -03:00
gnembon e43c693411 fixes in 1.15 2019-10-13 03:05:27 -03:00
gnembon 7fae5c92cf Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2019-10-13 02:55:19 -03:00
DeadlyMC a8936c9efe added nether and end mobs 2019-10-11 20:31:02 +05:30
DeadlyMC 0957bb9b0c forgot to add desert temple spawns 2019-10-11 20:19:36 +05:30
DeadlyMC 8ec1288079 flatWorldStructureSpawning 2019-10-11 18:28:37 +05:30
gnembon f0f3d4a60e updated mappings 2019-10-11 08:43:19 -03:00
gnembon fc66ec9c93 build in script load from resources, added 2 more events, added event test 2019-10-11 02:23:45 -03:00
gnembon 435794569e build in script load from resources, fixed entity value position errors, added 2 more events, added event test 2019-10-11 01:47:04 -03:00
gnembon 3b6c1d045e seems to be working fine, but trees and other decorations received massive bureaucratic payload 2019-10-10 01:46:44 -03:00
gnembon 155c62d3fc renamed and changed block based on the final mojang proposal 2019-10-10 00:33:25 -03:00
gnembon 3e6363ae12 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java
#	src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java
2019-10-09 21:37:27 -03:00
gnembon ec0be058ac 41a complete 2019-10-10 00:28:49 -03:00
gnembon 7b649f9ccd 19w41a first pass 2019-10-09 19:43:37 -03:00
gnembon 3ccfe38b75 should have gone with offset at the first place 2019-10-09 09:00:06 -03:00
gnembon 5a67d3223e Merge branch 'master' into 1.15 2019-10-09 08:58:39 -03:00
gnembon 83d91ede4f naming 2019-10-09 08:55:13 -03:00
gnembon c9a6d2ef96 slime is honey 2 2019-10-09 08:52:52 -03:00
gnembon 7ba4ff6647 slime is honey 1 2019-10-09 08:48:45 -03:00
gnembon c62625df66 Merge branch 'master' into 1.15 2019-10-08 09:10:55 -03:00
DeadlyMC 8be494fed0 missing @Final 2019-10-08 10:51:49 +05:30
gnembon 03703fd7fe 1.15 adjustments for scarpet 1.5 2019-10-08 02:18:09 -03:00
gnembon dc9532cf05 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java
#	src/main/java/carpet/script/CarpetExpression.java
2019-10-08 02:07:45 -03:00
gnembon 2167c929d5 two more events, and nbt cleanups 2019-10-06 22:06:38 -03:00
gnembon b7548456ca Merge branch 'master' into 1.15 2019-10-04 22:59:44 -03:00
gnembon 891cfbddde fix errors and excepted axes from auto gb protection. 2019-10-04 22:57:52 -03:00
gnembon 8d29f95155 oups 2019-10-02 16:21:34 -03:00
gnembon 4fc8f112e9 one more battle won in the parrot war 2019-10-02 16:20:50 -03:00
gnembon 6f156f9fc2 19w40a 2019-10-02 16:17:07 -03:00
gnembon 1195b95d0d 19w39a 2019-09-27 16:35:41 -05:00
gnembon 5d25dd9c9d 19w39a one more fix 2019-09-27 12:41:40 -05:00
gnembon 4b55b1465d 19w39a first fixes 2019-09-27 12:37:27 -05:00
gnembon 34aaa2e46c fixed coral crash 2019-09-22 20:37:03 -03:00