Commit Graph
759 Commits
Author SHA1 Message Date
gnembon 3e3dc3f868 fix merge errors 2020-04-16 23:32:02 -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 531d1356a6 merge fixes 2020-04-16 21:11:12 -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 bcbb197f13 Merge branch 'master' into 1.16
# Conflicts:
#	docs/scarpet/Full.md
#	docs/scarpet/api/BlocksAndWorldAccess.md
2020-04-16 00:55:09 -03:00
gnembon 022addf4e1 fixed #225 yet again, added display_name, command_name and team option for entities. 2020-04-16 00:24:02 -03:00
gnembon 9a588cf19a fixes #225 2020-04-15 23:58:59 -03:00
gnembon f47130a5fe Revert "Fixed Ticket #225" 2020-04-15 23:51:02 -03:00
SnaveSutit 999106480c Fixed Ticket #225 2020-04-15 22:39:07 -04: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 66e361167d didn't treat appending to containers the same way for variables as well as for container lvalues. Fixes #209 2020-04-12 20:26:49 -03:00
gnembon d6d6b69fcb added inhabited_time and player events revolving around damage, death and respawns. 2020-04-12 19:42:04 -03:00
gnembon 7369f39f06 Merge branch 'master' into 1.16 2020-04-08 01:29:08 -03:00
gnembon c1deda1b64 mappings 2020-04-08 01:16:47 -03:00
gnembon a867c04b11 inhabited_time 2020-04-04 01:31:44 -03:00
gnembon 76080f1a59 20w14a 2020-04-02 23:38:19 -03:00
gnembon a4626df004 Merge branch 'master' into 1.16 2020-04-01 13:22:16 -03:00
gnembon c2dfaca1b8 added 'ping' 2020-04-01 13:09:02 -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 930dc6f701 Merge branch 'master' into 1.16 2020-03-26 03:19:09 -03:00
gnembon c66ed96a98 added handler for on_lightning 2020-03-26 03:18:49 -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 b860f2b9b8 Merge branch 'master' into 1.16 2020-03-23 00:16:28 -03:00
gnembon 3adc628e8f added scarpet c_for loops 2020-03-23 00:10:50 -03:00
gnembon 52aab4a6cb Merge branch 'master' into 1.16 2020-03-22 23:33:39 -03:00
gnembon 9da1f087fd added entity API pose and fixed #180 2020-03-22 23:33:19 -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
gnembon 3f9556f9aa added legacy untracked npp lang specs 2020-03-18 00:47:30 -03:00