Commit Graph
274 Commits
Author SHA1 Message Date
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
gnembon 7369f39f06 Merge branch 'master' into 1.16 2020-04-08 01:29:08 -03:00
gnembon a867c04b11 inhabited_time 2020-04-04 01:31:44 -03:00
gnembon 43ff0e8c11 mappings 2020-03-29 02:17:13 -03:00
gnembon 419b739d5e Merge branch 'master' into 1.16 2020-03-28 22:03:58 -03:00
gnembon 5d94e4a1ad added is_chunk_generated and docs on reset_chunk 2020-03-27 10:35:38 -03:00
gnembon 9806af6ff9 reset chunks allow to refresh chunk client side + report. 2020-03-27 01:39:59 -03:00
gnembon 061ab76b19 20w13a 2020-03-25 15:42:40 -03:00
gnembon 60eaca236f Merge branch 'master' into 1.16 2020-03-25 09:21:48 -03:00
gnembon bb0d856706 permissions and access of expression functions, fixes #157 2020-03-25 09:14:39 -03:00
gnembon 48bb2aa0a1 Merge branch 'master' into 1.16 2020-03-25 00:32:18 -03:00
gnembon ba96b1b034 scoreboard API 2020-03-25 00:32:00 -03:00
gnembon 90add8bd63 scoreboard /1 2020-03-24 09:44:56 -03:00
gnembon 153b04ed1c 'break' and 'continue' support for 'scan' and 'volume' 2020-03-23 14:14:25 -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 583e023eb1 Merge branch 'master' into 1.16 2020-03-18 02:01:01 -03:00