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

..

CameraModeCommand.java

Merge branch 'master' into 1.15

2019-12-10 23:14:04 -04:00

CounterCommand.java

moved CarpetSettings up from settings manager, should be easier to find later.

2019-12-10 23:08:40 -04:00

DistanceCommand.java

moved CarpetSettings up from settings manager, should be easier to find later.

2019-12-10 23:08:40 -04:00

DrawCommand.java

moved CarpetSettings up from settings manager, should be easier to find later.

2019-12-10 23:08:40 -04:00

InfoCommand.java

moved CarpetSettings up from settings manager, should be easier to find later.

2019-12-10 23:08:40 -04:00

LogCommand.java

moved CarpetSettings up from settings manager, should be easier to find later.

2019-12-10 23:08:40 -04:00

MobAICommand.java

moved CarpetSettings up from settings manager, should be easier to find later.

2019-12-10 23:08:40 -04:00

PerimeterInfoCommand.java

Merge branch 'master' into 1.15

2019-12-10 23:14:04 -04:00

PlayerCommand.java

moved CarpetSettings up from settings manager, should be easier to find later.

2019-12-10 23:08:40 -04:00

ScriptCommand.java

Merge branch 'master' into 1.15

2019-12-10 23:14:04 -04:00

SpawnCommand.java

moved CarpetSettings up from settings manager, should be easier to find later.

2019-12-10 23:08:40 -04:00

TestCommand.java

added option to display rules from category

2019-09-27 11:00:51 -05:00

TickCommand.java

moved CarpetSettings up from settings manager, should be easier to find later.

2019-12-10 23:08:40 -04:00