Commit Graph
100 Commits
Author SHA1 Message Date
gnembon bdbeea6dfa new 1.16 formatting fixes #253 2020-04-25 17:31:35 -03:00
gnembon b3b94bdd68 mappings 2020-04-23 00:03:33 -03:00
gnembon 23baea19a1 tree plop eagerly fixes #246 2020-04-22 22:32:02 -03:00
gnembon 4270f8d718 Merge branch 'master' into 1.16
# Conflicts:
#	gradle.properties
#	src/main/java/carpet/CarpetSettings.java
#	src/main/resources/fabric.mod.json
2020-04-22 17:11:10 -03:00
gnembon 1ab00ef957 1.3.20 2020-04-22 17:08:55 -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 1e04eafdc2 1.16 fixes 2020-04-22 01:49:36 -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 f5316a1e2d fixes #228 2020-04-21 01:38:48 -03:00
gnembon d56706b133 fixes #234 2020-04-21 03:03:28 -03:00
gnembon a02d4d7e7c Merge branch 'master' into 1.16 2020-04-16 22:34:20 -03:00
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 574b5e0431 added bastion remnants to overlay 2020-04-16 09:52:53 -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 a229c2084c added new structure info 2020-04-15 22:46:58 -03:00
gnembon 7d1bced80d gave proper names to bastion structures. 2020-04-15 22:22:57 -03:00
gnembon 8cd79d0add b for bastion 2020-04-15 13:46:13 -03:00
gnembon d6a903bd16 added variants to bastions 2020-04-15 13:45:17 -03:00
gnembon 9c75d55579 docs 2020-04-15 13:21:56 -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 ca74935742 Merge branch 'master' into 1.16 2020-04-15 12:40:44 -03:00
gnembon 4bb283a851 1.3.19 2020-04-15 12:39:36 -03:00
gnembon 0da9e149cc Merge branch 'master' into 1.16 2020-04-15 12:35:37 -03:00
gnembon 7ddf8658c8 refine tnt messaging 2020-04-15 11:51:46 -03:00
gnembon ea1d1ab972 Merge branch 'master' into 1.16 2020-04-15 11:03:13 -03:00
gnembon 3fe2d5174b added 'last_tick_times' 2020-04-15 11:02:46 -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 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 07b3029820 added mixer option and defaulted sounds to master. Fixes #201 2020-04-13 02:04:00 -03:00
gnembon e6df82f30f mappings 2020-04-13 01:21:27 -03:00
gnembon 9b9750280c fixes for 1.16 2020-04-13 01:18:39 -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 19a01bee1b cannot shadow other players if you are not OP. Fixes #208 2020-04-12 20:47:39 -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 9b50bf3a79 Merge branch 'master' into 1.16 2020-04-08 12:32:07 -03:00
gnembon e1948a2fe0 1.3.18 2020-04-08 12:31:08 -03:00
gnembon c114031f6d 20w15a 2020-04-08 12:30:06 -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 a867c04b11 inhabited_time 2020-04-04 01:31:44 -03:00
gnembon d08a348266 block not pos 2020-04-03 00:50:22 -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 321a051a80 1.3.17? 2020-04-01 13:19:37 -03:00
gnembon c2dfaca1b8 added 'ping' 2020-04-01 13:09:02 -03:00
gnembon 652ca7d6a0 spawning illegal entities with perimetercheck, fixes #194 2020-03-31 21:04:09 -03:00
gnembon 182eac89c9 too long player names, fixes #195 2020-03-31 20:53:10 -03:00
gnembon 40ab2dda8d mappings 2020-03-31 02:03:04 -03:00
gnembon 1d86b4a223 Merge branch 'master' into 1.16 2020-03-31 00:05:08 -03:00
gnembon fe63334509 enabled some client side command interpretation. 2020-03-30 17:14:16 -03:00
gnembon f3093183ce added extra to fastRedstoneDust 2020-03-30 16:10:12 -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 0f2e149624 fix docs 2020-03-28 22:03:24 -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 2308cb0b5c 13b 2020-03-26 19:37:11 -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 999b547472 Merge branch 'master' into 1.16 2020-03-25 15:44:44 -03:00
gnembon 73e6c2ce5e 1.3.16 2020-03-25 15:43:43 -03:00
gnembon 061ab76b19 20w13a 2020-03-25 15:42:40 -03:00
gnembon b16a980106 20w13a 2020-03-25 15:42:02 -03:00
gnembon 88bc4b2d3a Merge branch 'master' into 1.16 2020-03-25 09:51:59 -03:00
gnembon 4c85e53924 added scoreboard and c_for keywords to editor tools 2020-03-25 09:51:42 -03:00
gnembon 60eaca236f Merge branch 'master' into 1.16 2020-03-25 09:21:48 -03:00
gnembon 78c1b1fc7c Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2020-03-25 09:14:56 -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 7b21674f5b fixes drop duplication with movable block entities, as indicated by skyrising 2020-03-25 01:08:54 -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 d8abd3ac4c note on break and continue 2020-03-23 00:13:46 -03:00
gnembon 3adc628e8f added scarpet c_for loops 2020-03-23 00:10:50 -03:00
gnembon 95c10177b6 mapping 2020-03-22 23:38:14 -03:00
gnembon c7ea2c08f9 mapping 2020-03-22 23:35:01 -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 eb6b15ffc3 mappings 2020-03-19 08:35:15 -03:00
gnembon 8928fbfb46 Merge branch 'master' into 1.16
# Conflicts:
#	gradle.properties
2020-03-18 21:56:20 -03:00