 gnembon
|
c995716357
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/fakes/StructureFeatureInterface.java
# src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java
|
2020-01-06 21:28:07 -04:00 |
|
|
gnembon
|
6ac249968a
|
remove a few warnings
|
2020-01-06 21:26:44 -04: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
|
cb900f638f
|
19w42a
|
2019-10-16 15:00:53 -03:00 |
|
|
gnembon
|
89b3cd8352
|
removed honeyslime, 1.1.3
|
2019-10-16 09:42:53 -03:00 |
|
|
gnembon
|
6018f680b4
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/mixins/PistonHandler_movableTEMixin.java
|
2019-10-16 09:40:36 -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
|
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
|
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 |
|