 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
|
c47083218b
|
fix merge erorrs
|
2019-09-18 21:03:15 -03:00 |
|
|
gnembon
|
aa3b9e8ed4
|
fix merge erorrs
|
2019-09-18 20:55:55 -03:00 |
|
|
gnembon
|
45ee4ecbaf
|
remove pause when frozen
|
2019-09-18 20:49:56 -03:00 |
|
|
gnembon
|
19e925725f
|
19w38b fixed shake rendering oncemore
|
2019-09-18 20:32:35 -03:00 |
|
|
gnembon
|
59f2c8f958
|
19w38b WIP
|
2019-09-18 16:25:08 -03:00 |
|
|
gnembon
|
da063aacb4
|
smooth low tps
|
2019-07-09 09:28:54 -03:00 |
|