Commit Graph
14 Commits
Author SHA1 Message Date
gnembon 8f9dd66cdf Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/BuriedTreasureGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/ClientPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/java/carpet/mixins/FossilFeatureMixin.java
#	src/main/java/carpet/mixins/GravityStructureProcessorMixin.java
#	src/main/java/carpet/mixins/IglooGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/KelpFeatureMixin.java
#	src/main/java/carpet/mixins/MobEntity_leashMixin.java
#	src/main/java/carpet/mixins/OceanRuinGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java
#	src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java
#	src/main/java/carpet/mixins/PortalBlock_portalCachingMixin.java
#	src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java
#	src/main/java/carpet/mixins/SaplingBlockMixin.java
#	src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java
#	src/main/java/carpet/mixins/ShipwreckGeneratorPieceMixin.java
#	src/main/java/carpet/mixins/SpawnHelperMixin.java
#	src/main/java/carpet/mixins/StructurePieceMixin.java
2019-12-10 23:14:04 -04:00
gnembon 55065a38a6 moved CarpetSettings up from settings manager, should be easier to find later. 2019-12-10 23:08:40 -04:00
gnembon 0021aa4a20 19w45b 2019-11-09 23:51:53 -04:00
gnembon 4b55b1465d 19w39a first fixes 2019-09-27 12:37:27 -05:00
gnembon a066c02469 fixed use of client side call 2019-09-27 12:25:26 -05:00
gnembon 6166eb3fbf better pistons rotators 2019-09-22 17:02:21 -03:00
gnembon 8293319587 fixed messup with rotator block 2019-09-22 16:41:23 -03:00
gnembon 8a01ebea41 profiler remembers requestee, and better rounding in scarpet 2019-08-23 06:04:13 +02:00
gnembon cd4ae14448 1.14.4pre1 2019-07-03 16:38:12 -03:00
gnembon 734dc95dab settings ported to the annotation based system 2019-06-11 23:01:09 -03:00
gnembon e9d2be34c0 cactus and block rotator 2019-06-08 01:11:34 -03:00
gnembon 5faa8754fb 1.14.3 pre 1 2019-06-03 22:37:12 -03:00
gnembon b88471a081 future protocol for alternative block placement 2019-05-14 15:59:37 -03:00
DeadlyMC 5b302b37aa ported BlockRotator.java 2019-05-14 19:50:17 +05:30