Commit Graph
189 Commits
Author SHA1 Message Date
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 dd7c06c034 Merge branch 'master' into 1.16 2020-04-29 01:25:15 -03:00
gnembon 94ffd5b990 rotatorBlock can rotate hoppers, fixes #238 2020-04-29 01:24:54 -03:00
gnembon 6798521e6b Merge branch 'master' into 1.16 2020-04-27 19:55:36 -03:00
gnembon 291268c14f reset tick rate when changing worlds in SP 2020-04-27 18:05:08 -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 64ffb27763 mappings 2020-04-15 02:12:57 -03:00
gnembon a757c6f88a Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/bundled/Module.java
2020-04-15 02:00:31 -03:00
gnembon 3e76adbdaa added deep frozen state where chunk tickets will not be expiring as well, preventing chunks from unloading. Fixes #204 2020-04-14 01:28:00 -03:00
gnembon 7369f39f06 Merge branch 'master' into 1.16 2020-04-08 01:29:08 -03:00
gnembon cdf7445e20 counter results sorted by rate 2020-04-08 01:28:43 -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 40ab2dda8d mappings 2020-03-31 02:03:04 -03:00
gnembon 43ff0e8c11 mappings 2020-03-29 02:17:13 -03:00
gnembon 130ef80d30 mappings back to normal 2020-03-20 01:47:18 -03:00
gnembon 93806466a8 20w12a 2020-03-18 18:56:41 -03:00
gnembon 1fcd8ceffa mappings 2020-03-18 02:34:03 -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 06781bb62e Merge branch 'master' into 1.16 2020-03-11 01:00:33 -03:00
gnembon 8f32354606 removed particles that has already been removed in vanilla 2020-03-11 01:00:08 -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 51ec01790b Merge branch 'master' into 1.16 2020-02-25 12:57:45 -04:00
gnembon 786ae4ae7f added logic to retry use if attack successful. 2020-02-25 12:57:04 -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 8a09fb55b2 Merge branch 'master' into 1.16 2020-02-09 01:57:58 -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 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 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