Commit Graph
892 Commits
Author SHA1 Message Date
gnembon 9ba573afe6 threading testing 2019-12-17 10:28:14 -04:00
gnembon 5d32213922 threading 2019-12-16 08:56:22 -04:00
gnembon 8752ac7011 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2019-12-14 01:09:22 -04:00
gnembon 1cf093731f extremeBenchmark 2019-12-13 18:04:47 -04:00
gnembon 7bfc2d394c Merge branch 'master' into 1.15 2019-12-13 01:28:14 -04:00
gnembon 04cd9ce93e should that fix mapping issues? 2019-12-13 01:25:08 -04:00
gnembon 509f7dc5f5 1.3.1 pre 1 2019-12-13 00:53:00 -04:00
gnembon c4dfc1919e settled on positioning 2019-12-13 00:51:42 -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 de20c14da9 fixed 1.15 positioning 2019-12-12 23:32:58 -04:00
gnembon ada89c1f7e fixed 1.15 positioning 2019-12-13 02:50:11 -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 9ebeba1d99 Merge branch 'master' into 1.15 2019-12-12 08:59:54 -04:00
gnembon cf489a9ab7 fix undef variables 2019-12-12 08:58:59 -04:00
gnembon 25a51da4b8 relative position fail 2019-12-12 01:44:54 -04:00
gnembon bb4d4eae22 Merge branch 'master' into 1.15 2019-12-12 00:01:02 -04:00
gnembon 8c83641199 readme 2019-12-11 23:59:59 -04:00
gnembon b80679080f Merge branch 'master' into 1.15 2019-12-11 23:46:20 -04:00
gnembon 6abd3c33f2 scarpet is 1.6 rn 2019-12-11 23:28:19 -04:00
gnembon 2d8ecb1341 Merge branch 'master' into 1.15 2019-12-11 00:59:37 -04:00
gnembon 98289b92fd carpet is not the only fabric mod in the world 2019-12-11 00:57:31 -04:00
gnembon e32f915967 plopped the docs 2019-12-11 00:50:21 -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 d279696c18 1.15 2019-12-11 00:04:38 -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 8b1286f8af fixed missed command registration for extension, 1.3.0, added optional version. 2019-12-10 23:01:30 -04:00
gnembon cc9cc17b27 Merge branch 'master' into 1.15 2019-12-10 00:13:20 -04:00
gnembon 3dfd44538b 4 2 2019-12-10 00:11:12 -04:00
gnembon 18a0ad097b 1.15 - pre7 2019-12-09 10:37:38 -04:00
gnembon 442b802638 Merge branch 'master' into 1.15 2019-12-09 10:36:40 -04:00
gnembon 5b2d45f152 1.2.6 aka 1.3 pre-1 2019-12-09 10:34:32 -04:00
gnembon 5005271ea3 Merge branch 'master' into 1.15 2019-12-08 13:14:55 -04:00
gnembon 1984c2cc77 fixed profiler counting be time in e time 2019-12-08 13:14:31 -04:00
gnembon 04459094e6 1.15 mixin cleanup 2019-12-07 01:07:19 -04:00
gnembon 380b9131d8 added bee tree 2019-12-07 01:06:08 -04:00
gnembon 56ea9ac961 cleaning up fixed 1.15 features 2019-12-06 16:49:50 -04:00
gnembon 511919ae1b trying the beehive feature 2019-12-06 16:22:29 -04:00
gnembon 9df699746c fixed plop 1.15 changes 2019-12-06 15:47:13 -04:00
gnembon 3907a949a3 Merge branch 'master' into 1.15 2019-12-06 13:41:39 -04:00
gnembon 9cca6ddfb5 just to make sure string booleans are handled properly 2019-12-06 13:41:13 -04:00
gnembon 645f5db2bf block commands by default supports new extended boolean values 2019-12-06 12:47:52 -04:00
gnembon 20f8c0a965 Merge branch 'master' into 1.15 2019-12-06 12:24:34 -04:00
gnembon 656638c6dc continue and break scarpet functions to replace _exit_ conditions in loops 2019-12-06 12:24:13 -04:00