 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
|
a463b10bca
|
1.15 pre1 - 7
|
2019-11-25 15:17:44 -04:00 |
|
|
gnembon
|
ec19e37a74
|
19w45a
|
2019-11-07 16:13:15 -04:00 |
|
|
gnembon
|
ff8dc630c5
|
19w44a
|
2019-10-30 13:38:51 -03:00 |
|
|
gnembon
|
7b649f9ccd
|
19w41a first pass
|
2019-10-09 19:43:37 -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 |
|
|
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
|
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 |
|
|
DeadlyMC
|
e409ae4108
|
added movableTE's with help from @2No2Name
|
2019-06-05 10:02:22 +05:30 |
|