Commit Graph
753 Commits
Author SHA1 Message Date
gnembon 025855af42 1.15.1 build 17 2019-12-27 23:29:58 -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 e9e36f64a3 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java
#	src/main/java/carpet/script/CarpetExpression.java
#	src/main/resources/carpet.mixins.json
2019-12-27 11:26:49 -04:00
gnembon 4f52a04d84 docs 2019-12-27 11:23:57 -04:00
gnembon d7ca974f1a statistics, block placed and interacted events, stats event test 2019-12-27 03:25:56 -04:00
gnembon d37c9075b8 Merge branch 'master' into 1.15 2019-12-25 22:00:32 -04:00
gnembon 733a09d14b optimized particle lines 2019-12-25 22:00:07 -04:00
gnembon 0b296cc05c update threads to 1.15.1 2019-12-25 03:33:25 -04:00
gnembon b09982e02c merge errors 2019-12-25 03:19:57 -04:00
gnembon 3e6f83905c Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2019-12-25 03:18:15 -04:00
gnembon ce744802cf cleanup 2019-12-25 03:10:32 -04:00
gnembon a4e6e7cb10 camera update and task clearing 2019-12-25 02:44:14 -04:00
gnembon 62529a352c camera update 2019-12-22 02:26:40 -04:00
gnembon 8c95aab2c6 scarpet thread safe pt1 2019-12-19 18:11:13 -04:00
gnembon 0e9566a58d removed set_async as pointless 2019-12-19 01:48:33 -04:00
gnembon ab3334e452 Merge branch 'threads' of https://github.com/gnembon/fabric-carpet into threads 2019-12-18 10:41:21 -04:00
gnembon 9457ce741c fixed te fillUpdates and client call fix. better camera 2019-12-18 10:41:03 -04:00
gnembon 2ff7988251 resolved joins from main thread as illegal 2019-12-17 14:41:47 -04:00
gnembon 3295ca2af9 Revert "threading testing"
This reverts commit 9ba573af
2019-12-17 11:59:23 -04:00
gnembon 423701d4d7 Revert "threading testing"
This reverts commit 9ba573af
2019-12-17 11:58:35 -04:00
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 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 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