Commit Graph
59 Commits
Author SHA1 Message Date
gnembon c94ba6a021 mappings 2020-06-02 12:23:52 -03:00
gnembon 3b588e8488 20w22a 2020-05-29 12:15:51 -03:00
gnembon 243c3290ae mappings 2020-05-27 00:46:44 -03:00
gnembon bec5259216 20w21a ohboi 2020-05-21 02:59:17 -03:00
gnembon dfd88b7142 20w20a 2020-05-13 16:58:12 -03:00
gnembon b9750a46ba update 2020-05-04 15:50:59 -03:00
gnembon ad713f0220 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/helpers/FeatureGenerator.java
2020-05-04 15:49:28 -03:00
gnembon ad43784ad6 unify structure info. 2020-05-04 15:48:45 -03:00
gnembon f84389c8d8 1.16 fixes 2020-05-02 20:05:40 -03:00
gnembon 6299e72e38 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/helpers/FeatureGenerator.java
#	src/main/java/carpet/script/CarpetExpression.java
2020-05-02 19:36:12 -03:00
gnembon 3821af4f82 structure_eligibility and notes on spawn_potential 2020-05-02 19:14:59 -03:00
gnembon ce4bd4f37f 20w18a 2020-04-29 22:24:24 -03:00
gnembon 23baea19a1 tree plop eagerly fixes #246 2020-04-22 22:32:02 -03:00
gnembon f2e9a9de91 20w17a 2020-04-22 17:00:31 -03:00
gnembon d749bbe3ff mappings 2020-04-22 02:10:28 -03:00
gnembon 7d1bced80d gave proper names to bastion structures. 2020-04-15 22:22:57 -03:00
gnembon d6a903bd16 added variants to bastions 2020-04-15 13:45:17 -03:00
gnembon 989987688c 20w16a plop them anywhere. 2020-04-15 13:12:25 -03:00
gnembon 7ed0a28843 20w16a, added ruined portals and bastion remnants structures 2020-04-15 12:56:10 -03:00
gnembon c1deda1b64 mappings 2020-04-08 01:16:47 -03:00
gnembon 76080f1a59 20w14a 2020-04-02 23:38:19 -03:00
gnembon 1ea7a30b81 added twisting vines to feature generator 2020-03-13 15:26:20 -03:00
gnembon a09ab80b4e 20w11a 2020-03-11 15:39:28 -03:00
gnembon 286913ebd7 mapping update, fixed missing target mixins 2020-03-11 00:01:59 -03:00
gnembon 4c5400dc38 mapping 2020-02-29 00:25:45 -04:00
gnembon 04ed78cd1e 20w09a 2020-02-26 14:09:42 -04:00
gnembon 0229953c74 ramaned fungi to fungus for plop 2020-02-26 13:47:46 -04:00
gnembon f12283aea4 good to set your priorities straight 2020-02-12 11:37:25 -04:00
gnembon 6de85769e9 mapping 2020-02-10 02:04:43 -04:00
gnembon c9438aefa4 20w06a-6 2020-02-06 21:30:14 -04:00
gnembon ba0ee10594 20w06a features 2020-02-05 19:54:31 -04:00
gnembon b9bd5ec17d 20w06a features 2020-02-05 18:24:01 -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 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 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 6497200dac 1.15 pre2 - 4 2019-11-28 11:43:55 -04:00