 gnembon
|
7b21674f5b
|
fixes drop duplication with movable block entities, as indicated by skyrising
|
2020-03-25 01:08:54 -03:00 |
|
|
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
|
6f156f9fc2
|
19w40a
|
2019-10-02 16:17:07 -03:00 |
|
|
gnembon
|
bf22134640
|
Merge branch 'master' into 1.15
|
2019-09-14 23:13:32 -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
|
628a350ea1
|
19w35a
|
2019-08-28 20:23:32 -03:00 |
|
|
gnembon
|
734dc95dab
|
settings ported to the annotation based system
|
2019-06-11 23:01:09 -03:00 |
|
|
gnembon
|
80c3494f23
|
1.13.2 used CM postfix for NBTs
just to avoid potential name collisions in case Mojang decides suddenly to add that tag and name it the same.
|
2019-06-05 22:46:33 -03:00 |
|
|
DeadlyMC
|
e409ae4108
|
added movableTE's with help from @2No2Name
|
2019-06-05 10:02:22 +05:30 |
|