Commit Graph
846 Commits
Author SHA1 Message Date
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
gnembon f6db78c04f Merge branch 'master' into 1.15 2019-09-22 17:02:40 -03:00
gnembon 6166eb3fbf better pistons rotators 2019-09-22 17:02:21 -03:00
gnembon eef353e4ea Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/SpawnHelperMixin.java
2019-09-21 23:28:36 -03:00
gnembon 76097c12e4 mocked entities don't need to be initialized. 2019-09-21 23:26:05 -03:00
gnembon cdb957867d restricted SS gbfix to dedicated 2019-09-21 21:27:49 -03:00
gnembon 11a5ba63a8 do not throttle particles when frozen 2019-09-19 01:12:02 -03:00
gnembon c47083218b fix merge erorrs 2019-09-18 21:03:15 -03:00
gnembon aa3b9e8ed4 fix merge erorrs 2019-09-18 20:55:55 -03:00
gnembon 45ee4ecbaf remove pause when frozen 2019-09-18 20:49:56 -03:00
gnembon 5f306f0ffc removed nullables 2019-09-18 20:45:39 -03:00
gnembon 19e925725f 19w38b fixed shake rendering oncemore 2019-09-18 20:32:35 -03:00
2No2Name ef94e7c302 Updated MovableBlockEntity Rendering Code 2019-09-19 01:07:43 +02:00
gnembon a825134fba 19w38b no movableBEs 2019-09-18 21:57:08 -03:00
gnembon 59f2c8f958 19w38b WIP 2019-09-18 16:25:08 -03:00
gnembon bde05ee7c8 Merge branch 'master' into 1.15 2019-09-17 09:38:01 -03:00
gnembon bb863a2864 fix 2019-09-17 08:39:49 -03:00