Commit Graph
10 Commits
Author SHA1 Message Date
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 155c62d3fc renamed and changed block based on the final mojang proposal 2019-10-10 00:33:25 -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 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 256d54fab7 removed all mentions of a tile per official Micro$oft corporate mappings 2019-09-13 17:00:14 -03:00
gnembon 734dc95dab settings ported to the annotation based system 2019-06-11 23:01:09 -03:00
gnembon 7e9b7e394b !true 2019-06-05 23:26:38 -03:00
DeadlyMC e409ae4108 added movableTE's with help from @2No2Name 2019-06-05 10:02:22 +05:30