Commit Graph
235 Commits
Author SHA1 Message Date
gnembon da954b038c 1.3.1 2019-12-12 23:36:06 -04:00
gnembon cf53ee72e0 Merge branch 'master' into 1.15 2019-12-12 17:22:56 -04:00
gnembon 05ac5dee2c extremeBenchmark 2019-12-12 17:22:06 -04:00
gnembon 9ef81069dc Merge branch 'master' into 1.15 2019-12-12 09:03:10 -04:00
gnembon 657acc3c6e towards 1.3.1 2019-12-12 09:02:46 -04:00
gnembon c0d9b6ecb6 Merge branch 'master' into 1.15 2019-12-11 00:31:58 -04:00
gnembon f9b51ef141 extremeBehaviours 2019-12-11 00:30:46 -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 734dc95dab settings ported to the annotation based system 2019-06-11 23:01:09 -03:00
gnembon 92f40c36b8 settings system 2019-06-11 02:08:50 -03:00
gnembon c7739f1963 portal caching, ignored item not creating portals issue on purpose 2019-06-10 01:33:59 -03:00
gnembon 5833d37d44 invisibility fixed by Mojang 2019-06-08 01:22:40 -03:00
gnembon e9d2be34c0 cactus and block rotator 2019-06-08 01:11:34 -03:00
DeadlyMC bb517f082c persistentParrots 2019-06-06 17:41:40 +05:30
gnembon fd6c5c5787 Merge pull request #29 from DeadlyMC/desert_shrus
Completed desertShrubs port
2019-06-06 08:14:13 -03:00
DeadlyMC a8598ad700 desertShrubs 2019-06-06 16:26:24 +05:30
DeadlyMC db6e619849 resolve merge conflicts 2019-06-06 16:12:34 +05:30
DeadlyMC 9e5981a3b9 Merge remote-tracking branch 'upstream/master' into renewableSponges 2019-06-06 16:11:06 +05:30
DeadlyMC 6008c8e4a5 added renewableSponges mixins 2019-06-05 15:52:17 +05:30
DeadlyMC e409ae4108 added movableTE's with help from @2No2Name 2019-06-05 10:02:22 +05:30
gnembon c04b18b158 update to 1.14.3 pre1 2019-06-04 10:21:21 -03:00
gnembon 5faa8754fb 1.14.3 pre 1 2019-06-03 22:37:12 -03:00
DeadlyMC db091d68d7 added placementRotationFix mixins 2019-06-01 21:07:58 +05:30
gnembon 7800daacb8 added command source to rule validators and added WIP tag 2019-05-24 22:27:35 -03:00
gnembon acfa91d1e8 changed version to v19_05_25 2019-05-24 16:20:51 -03:00
gnembon b257e6f984 other features 2019-05-22 15:21:07 -03:00
gnembon d35b6bde36 fill stuff 2019-05-18 14:24:51 -03:00
gnembon 3330e6f922 rework motd and 14.2 pre 2 2019-05-18 00:45:36 -03:00
gnembon c0b4e40e6f Merge pull request #5 from Salandora/StackableShulkerboxes
Empty stackable shulker boxes
2019-05-17 00:22:40 -03:00
gnembon 885f579d6c scarpet v1.2 2019-05-16 14:11:39 -03:00
Marc Hannappel 9e72423a41 Ported "stackable empty shulkerboxes on ground" based on @maruohon's tweakeroo code 2019-05-16 18:05:15 +02:00
gnembon ecced620a4 moved a bunch of stuff 2019-05-12 01:48:19 -03:00
gnembon ec66779474 basic inits 2019-05-11 01:06:48 -03:00
gnembon 6970864d8d cameramode, and draw commands 2019-05-10 01:26:39 -03:00