Commit Graph
942 Commits
Author SHA1 Message Date
gnembon bec5259216 20w21a ohboi 2020-05-21 02:59:17 -03:00
gnembon abd5f178be Merge branch 'master' into 1.16 2020-05-20 02:13:37 -03:00
gnembon 934038828c handled errors in server docked tasks to continue stack trace of internal exceptions. 2020-05-20 02:13:12 -03:00
gnembon ab86fc9292 added 'portal_cooldown' and 'portal_timer' to entity API (query and modify) 2020-05-20 02:09:57 -03:00
gnembon 208c066da1 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-05-19 18:18:27 -03:00
gnembon 66c222a77a poi results now come out sorted by distance 2020-05-19 18:17:50 -03:00
gnembon dcac57a1a2 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java
2020-05-18 22:18:29 -03:00
gnembon 0a7b231a63 added add_chunk_ticket 2020-05-18 22:14:07 -03:00
gnembon 5ed5718b87 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/CarpetExpression.java
2020-05-17 23:54:54 -03:00
gnembon 06ede1fbc0 added add_chunk_ticket 2020-05-17 23:52:59 -03:00
gnembon fae24ad446 Merge branch 'master' into 1.16 2020-05-15 02:01:18 -03:00
gnembon 524cb62803 fix 2020-05-15 02:01:07 -03:00
gnembon ec43fd2f24 Merge branch 'master' into 1.16 2020-05-15 01:43:35 -03:00
gnembon 7447129d92 added reload_chunk and added option for set_biome not to send chunk 2020-05-15 01:43:11 -03:00
gnembon dfd88b7142 20w20a 2020-05-13 16:58:12 -03:00
gnembon 3e0cd65434 fixed entity 'home' arguments 2020-05-13 09:28:44 -03:00
gnembon a4750f7238 fixed entity 'home' arguments 2020-05-12 23:28:34 -03:00
gnembon e5aea149cf Merge branch 'master' into 1.16 2020-05-12 23:04:04 -03:00
gnembon afe8f4b403 Merge branch 'master' into 1.16 2020-05-12 15:27:45 -03:00
gnembon d0bd956bbd double evaluation, fixes #271 2020-05-12 15:26:20 -03:00
gnembon 9512eb7af5 Merge branch 'master' into 1.16 2020-05-11 01:02:12 -03:00
gnembon f7cfcb4158 oupsie 2020-05-11 01:01:36 -03:00
gnembon b631f7b62e fixed notation of ranges 2020-05-10 18:44:49 -03:00
gnembon 5e5393ba3d Merge branch 'master' into 1.16 2020-05-10 17:25:21 -03:00
gnembon 52cf599375 added task_dock 2020-05-10 17:24:35 -03:00
gnembon 56f8f17aaa tighten up function args for non-linear calls 2020-05-10 13:11:58 -03:00
gnembon ae0975d626 mappings 2020-05-10 01:42:19 -03:00
gnembon 2333f57f4a Merge branch 'master' into 1.16 2020-05-05 17:18:30 -03:00
gnembon aade01a3b3 place_item can use non-block items. fixes #260 2020-05-05 17:18:04 -03:00
gnembon cfe1a9e729 fix 2020-05-04 23:09:02 -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 b16991d84b mapping updates 2020-05-04 00:09:22 -03:00
gnembon cdb79f9768 Merge branch 'master' into 1.16 2020-05-03 23:21:39 -03:00
gnembon 15ac3edc19 clarifications around 'str' 2020-05-03 23:10:09 -03:00
gnembon 1f65c1b55c Merge branch 'master' into 1.16 2020-05-02 20:19:34 -03:00
gnembon 2ec095a1bf oupsie 2020-05-02 20:19:19 -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 e802b2df6c Merge branch 'master' into 1.16 2020-05-02 14:44:26 -03:00
gnembon 300e963b0b biome and structure calls should only request status they need. 2020-05-02 14:44:11 -03:00
gnembon ef61b396fd Merge branch 'master' into 1.16 2020-05-02 12:47:33 -03:00
gnembon dbb29cbeb9 multiline stings cause tokens to offset incorrectly error messages 2020-05-02 12:47:07 -03:00
gnembon 460a78f866 spawn_potential 2020-04-30 19:25:59 -03:00
gnembon 95a7420e7d Merge branch 'master' into 1.16 2020-04-29 11:41:10 -03:00
gnembon 1e9a8726be tweaks to entity API code 2020-04-29 11:32:42 -03:00
gnembon 1aa237379e Merge pull request #241 from Ghoulboy78/modfy
added gamemode and jumping modifications
2020-04-29 10:36:48 -03:00
gnembon e64f6c87d4 Merge branch 'master' into 1.16 2020-04-29 00:48:26 -03:00
gnembon 7577c475f6 format, fixes #254 2020-04-29 00:48:02 -03:00
gnembon 5713d2bffc Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/utils/Messenger.java
2020-04-28 19:40:46 -03:00