Commit Graph
219 Commits
Author SHA1 Message Date
gnembon c4c9f16fa6 1.3.11 2020-02-21 12:46:11 -04:00
gnembon f12283aea4 good to set your priorities straight 2020-02-12 11:37:25 -04:00
gnembon e63dd15433 raneming 2020-02-08 18:17:55 -04:00
ImUrX fe56ab8d3e overwrite getMaxNetherPortalTime 2020-02-08 16:18:56 -03:00
gnembon 73680247f4 b 2020-02-06 09:35:08 -04:00
gnembon 85a34fdefa added profile command 2020-02-06 09:33:46 -04:00
gnembon e6a49467c4 1.3.9, why not 2020-02-05 19:55:43 -04:00
gnembon ae56f3e2ba 1.3.8 2020-02-05 13:28:44 -04:00
gnembon 00a540505e Merge branch 'master' into 1.15 2020-01-28 12:23:11 -04:00
gnembon 4bf27c3d15 interactionUpdates 2020-01-28 12:22:51 -04:00
gnembon 26a038041e Merge branch 'master' into 1.15 2020-01-27 23:14:15 -04:00
gnembon 021befbd3c 1.3.7 2020-01-27 23:14:01 -04:00
gnembon e94dd23402 Merge branch 'master' into 1.15 2020-01-27 14:50:11 -04:00
gnembon 6c1d3dd5f6 fix defaults on hardcodeTNTangle 2020-01-27 14:48:56 -04:00
gnembon cccda661df Merge branch 'master' into 1.15 2020-01-21 11:42:05 -04:00
gnembon 0a42562b5b 1.3.6 2020-01-21 11:40:57 -04:00
gnembon 7c7c4733fc Merge branch 'master' into 1.15 2020-01-14 14:26:14 -04:00
gnembon a2d7d6da6a 1.3.5 version 2020-01-14 14:25:11 -04:00
gnembon 892fa1e9a1 Merge branch 'master' into 1.15 2020-01-11 11:53:45 -04:00
gnembon 9011e419cb 1.3.4 2020-01-11 11:51:06 -04:00
gnembon 1ea8815bd0 Merge branch 'master' into 1.15 2020-01-10 21:50:20 -04:00
gnembon b4482214c9 customizable forceload limit 2020-01-10 21:48:09 -04:00
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 09500c2a9b Merge branch 'master' into 1.15 2020-01-05 17:25:25 -04:00
gnembon 3bec43fbc8 up-date 2020-01-05 17:12:55 -04:00
gnembon 8bcb433f72 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java
#	src/main/resources/carpet.mixins.json
2020-01-03 00:16:46 -04:00
gnembon 78ea9cd6e4 1.3.3 2020-01-03 00:13:05 -04:00
gnembon 2880924491 Merge branch 'master' into 1.15 2019-12-30 01:00:42 -04:00
gnembon 6d89763ecc final 1.3.2 2019-12-30 00:47:42 -04:00
gnembon bebd93f73c Merge branch 'master' into 1.15 2019-12-27 22:45:48 -04:00
gnembon 7a4f3361b2 1.3.2 2019-12-27 22:45:34 -04:00
gnembon ff0140309e Merge branch 'master' into 1.15 2019-12-12 23:45:08 -04:00
gnembon e591e68107 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2019-12-12 23:36:25 -04:00
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