 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
|
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
|
79e7bba04b
|
restrict honey rule to 1.14 only
|
2019-10-16 09:38:47 -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
|
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 |
|
|
DeadlyMC
|
8be494fed0
|
missing @Final
|
2019-10-08 10:51:49 +05:30 |
|
|
gnembon
|
256d54fab7
|
removed all mentions of a tile per official Micro$oft corporate mappings
|
2019-09-13 17:00:14 -03:00 |
|
|
2No2Name
|
6be5e1f453
|
Made doublechests stick together when moved by a piston
|
2019-08-18 14:35:31 +02:00 |
|