Commit Graph
100 Commits
Author SHA1 Message Date
gnembon 5a746cc3c4 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/commands/SpawnCommand.java
#	src/main/java/carpet/utils/SpawnReporter.java
2020-05-12 17:01:57 -03:00
gnembon 955eb361f4 added 'all' options to spawn entites and fixed definition of mobcappable 2020-05-12 17:00:02 -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 566515d0c3 Merge branch 'master' into 1.16 2020-05-10 00:56:01 -03:00
gnembon d35769a365 specified conditions for creative fly controls 2020-05-10 00:50:02 -03:00
gnembon 0ad542236c untested - creativeFlySpeed, creativeFlyDrag 2020-05-07 19:16:04 -03:00
gnembon db813ee29b 20w19a 2020-05-06 15:10:45 -03:00
gnembon 08d48e765d Merge branch 'master' into 1.16 2020-05-06 14:35:03 -03:00
gnembon 983f24a87d 1.3.22 2020-05-06 14:34:04 -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 d29fa3bdf5 fix 2020-05-04 22:43:32 -03:00
gnembon e94bd7f59a Merge branch 'master' into 1.16 2020-05-04 22:08:31 -03:00
gnembon 771de74a03 noclip can place blocks intersecting with sefl 2020-05-04 22:07:22 -03:00
gnembon 18ecc4ec4f Merge branch '1.16' of https://github.com/gnembon/fabric-carpet into 1.16 2020-05-04 19:54:11 -03:00
gnembon 13289b023d duh 2020-05-04 19:53:40 -03:00
gnembon 74c5116ec3 Merge branch 'master' into 1.16 2020-05-04 19:47:02 -03:00
gnembon 440dc6e2f4 creative no clip 2020-05-04 19:46:28 -03:00
gnembon b9750a46ba update 2020-05-04 15:50:59 -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 04a5dd2c2c fixed missing links and commands 2020-05-03 16:01:01 -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 f84389c8d8 1.16 fixes 2020-05-02 20:05:40 -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 31a5ea6873 Merge branch 'master' into 1.16 2020-05-01 01:56:20 -03:00
gnembon 460a78f866 spawn_potential 2020-04-30 19:25:59 -03:00
gnembon c283fddd38 Merge branch 'master' into 1.16 2020-04-30 00:45:35 -03:00
gnembon 2fe5ed615e fog off client command added 2020-04-30 00:44:46 -03:00
gnembon ce4bd4f37f 20w18a 2020-04-29 22:24:24 -03:00
gnembon f04888406d 20w18a-1 2020-04-29 20:45:01 -03:00
gnembon 98f514ffce mapping fixes 2020-04-29 11:49:27 -03:00
gnembon 95a7420e7d Merge branch 'master' into 1.16 2020-04-29 11:41:10 -03:00
gnembon 95d97608c2 added format to editor support files 2020-04-29 11:37:54 -03:00
gnembon 1e9a8726be tweaks to entity API code 2020-04-29 11:32:42 -03:00
gnembon dd7c06c034 Merge branch 'master' into 1.16 2020-04-29 01:25:15 -03:00
gnembon 94ffd5b990 rotatorBlock can rotate hoppers, fixes #238 2020-04-29 01:24:54 -03:00
gnembon 434dedc57d 1.3.21 2020-04-29 01:03:39 -03:00
gnembon 07439cf648 detail 2020-04-29 00:53:57 -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 9e4c27b148 merge fixes 2020-04-28 20:01:46 -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 0b72f85474 messenger can parse style 2020-04-28 19:39:13 -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 86e8433d77 mapping 2020-04-28 16:00:51 -03:00
gnembon 9dff0f822a mapping 2020-04-28 15:50:36 -03:00
gnembon cc668fd122 1.16 bump 2020-04-28 03:00:19 -03:00
gnembon f70850889d Merge branch 'master' into 1.16 2020-04-28 02:55:48 -03:00
gnembon 714bf1ce19 refactor and fix new draw shapes 2020-04-28 02:55:26 -03:00
gnembon 5542a46b43 First, not second 2020-04-28 00:03:39 -03:00
gnembon 6798521e6b Merge branch 'master' into 1.16 2020-04-27 19:55:36 -03:00
gnembon c6efb42195 fixed position correction packets for superhot 2020-04-27 19:55:01 -03:00
gnembon 291268c14f reset tick rate when changing worlds in SP 2020-04-27 18:05:08 -03:00
gnembon e7e2485211 Merge branch 'master' into 1.16 2020-04-27 16:11:25 -03:00
gnembon 30dd021703 incorrect monitoring of player movement 2020-04-27 16:10:34 -03:00
gnembon 86d40b13fb Merge branch 'master' into 1.16 2020-04-25 17:34:04 -03:00
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