Commit Graph
98 Commits
Author SHA1 Message Date
gnembon f12283aea4 good to set your priorities straight 2020-02-12 11:37:25 -04:00
gnembon 161b5d491d added options for drop command 2020-02-09 01:56:30 -04:00
gnembon 8ed56c1d81 raneming 2020-02-08 18:27:34 -04:00
gnembon fbd917b005 1.15.2-11 2020-02-03 12:06:40 -04:00
gnembon e04a8be9e8 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-02-03 10:58:17 -04:00
gnembon ef16ade921 forgot fortress 2020-01-30 02:22:54 -04:00
gnembon 797894c662 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-01-25 20:06:54 -04:00
gnembon b612be2b04 renaming a few structures for consistence 2020-01-25 20:03:44 -04:00
gnembon 9d2aa40944 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-01-21 09:47:44 -04:00
gnembon 6d41fcd372 cleanup 2020-01-21 09:45:36 -04:00
gnembon 81e0d733f7 merging structures to 1.15 2020-01-21 01:56:56 -04:00
gnembon 145bcf1b3c Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/fakes/StructureFeatureInterface.java
#	src/main/java/carpet/helpers/FeatureGenerator.java
#	src/main/java/carpet/mixins/StructureFeatureMixin.java
2020-01-21 01:43:53 -04:00
gnembon 50d30aafb2 structure_set and unification with scarpet naming conventions 2020-01-21 01:39:23 -04:00
gnembon 9c62968ee8 1.15.2 pre2 and mappings 2020-01-17 17:36:39 -04:00
gnembon 1ea8815bd0 Merge branch 'master' into 1.15 2020-01-10 21:50:20 -04:00
gnembon e44cf0d79b action pack improvements 2020-01-10 21:48:55 -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 8725b59241 Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/commands/ScriptCommand.java
#	src/main/java/carpet/helpers/EntityPlayerActionPack.java
2020-01-05 02:27:33 -04:00
gnembon 15fe9c5ad9 fixes #126 2020-01-03 16:45:35 -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
G4me4u 08539da5cc Renamed establishTickrateLink to addTickrateListener 2020-01-02 22:23:54 +01:00
G4me4u 490db4f5d6 Added a way to ensure tickrate compatibility with other mods 2020-01-02 21:49:13 +01:00
gnembon 43c9a8a886 Merge branch 'master' into 1.15 2019-12-28 20:41:39 -04:00
gnembon 86ce6f3505 rd dust duplication bug 2019-12-28 20:41:20 -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 380b9131d8 added bee tree 2019-12-07 01:06:08 -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 7802037ab0 fix explosions yet again 2019-12-03 17:30:37 -04:00
gnembon 6497200dac 1.15 pre2 - 4 2019-11-28 11:43:55 -04:00
gnembon a463b10bca 1.15 pre1 - 7 2019-11-25 15:17:44 -04:00
gnembon 8ecaac80e2 1.15 pre1 2019-11-21 16:35:24 -04:00
gnembon 0021aa4a20 19w45b 2019-11-09 23:51:53 -04:00
gnembon ff8dc630c5 19w44a 2019-10-30 13:38:51 -03:00
gnembon 36e5e31d06 updated to .5 fabric 2019-10-29 01:32:39 -03:00
gnembon b1e2b4367d Merge branch 'master' into 1.15 2019-10-28 21:55:49 -03:00
gnembon 144f3a2ad8 fix stackable shulkerboxes ignoring other tags 2019-10-28 21:39:32 -03:00
gnembon a5955358bb fixes to 1.15 for tnt 2019-10-23 09:05:41 -03:00
gnembon f41ae0f00e Merge branch 'master' into 1.15
# Conflicts:
#	src/main/java/carpet/mixins/TntEntityMixin.java
#	src/main/java/carpet/script/value/EntityValue.java
2019-10-23 08:58:57 -03:00
Joe ab6b1a8ad0 Fix ugly variable names caused by find/replace 2019-10-23 10:05:57 +01:00
Joe df2ea4d2cc Add TNT rules 2019-10-23 04:53:34 +01:00
gnembon f0f3d4a60e updated mappings 2019-10-11 08:43:19 -03:00
gnembon 3b6c1d045e seems to be working fine, but trees and other decorations received massive bureaucratic payload 2019-10-10 01:46:44 -03:00
gnembon 7b649f9ccd 19w41a first pass 2019-10-09 19:43:37 -03:00
gnembon b7548456ca Merge branch 'master' into 1.15 2019-10-04 22:59:44 -03:00
gnembon 891cfbddde fix errors and excepted axes from auto gb protection. 2019-10-04 22:57:52 -03:00
gnembon 6f156f9fc2 19w40a 2019-10-02 16:17:07 -03:00