Commit Graph
341 Commits
Author SHA1 Message Date
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 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 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 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 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 460a78f866 spawn_potential 2020-04-30 19:25:59 -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
gnembon 5bb5f372b6 scoreboard_remove(obj, key) will remove the key from the objective. Fixes #255 2020-04-28 18:38:56 -03:00
gnembon c0d8f1e5a1 Merge branch 'master' into 1.16 2020-04-22 01:46:31 -03:00
gnembon 24787e8e56 renaming getTicketManager to de-conflict with other mods 2020-04-22 01:26:06 -03:00
gnembon a02d4d7e7c Merge branch 'master' into 1.16 2020-04-16 22:34:20 -03:00
gnembon 609fc67061 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/utils/CarpetArgParser.java
2020-04-16 23:30:37 -03:00
gnembon 17b15b4893 refactor arg parsers 2020-04-16 23:30:05 -03:00
gnembon 56749f731a refactored scan to also take pos arguments. 2020-04-16 22:33:53 -03:00
gnembon a6477d3919 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/script/value/BlockValue.java
2020-04-16 21:02:16 -03:00
gnembon fb1a03b3f7 refactor argument parsers 2020-04-16 17:47:06 -03:00
gnembon ea1d1ab972 Merge branch 'master' into 1.16 2020-04-15 11:03:13 -03:00
gnembon 6932e5b682 added 'last_tick_times' 2020-04-15 11:01:26 -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 8dbf269fde added world_time and day_time. Add ability to store app data in shared space. as well as store in file hierarchies. Fixes #215 2020-04-15 01:58:46 -03:00
gnembon 07b3029820 added mixer option and defaulted sounds to master. Fixes #201 2020-04-13 02:04:00 -03:00
gnembon 7ebc96106b Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/mixins/ChunkTicketManager_scarpetMixin.java
#	src/main/java/carpet/mixins/MinecraftServer_coreMixin.java
2020-04-13 01:08:06 -03:00
gnembon 2a1d5542f1 just to change from disabling spawn chunks to control over its size. Removes disableSpawnChunks, adds spawnChunksSize. Fixes #192 2020-04-13 00:59:55 -03:00