Commit Graph
100 Commits
Author SHA1 Message Date
gnembon cf817c2e39 mappings 2020-05-21 14:23:04 -03:00
gnembon 42ba5a9f03 Merge branch 'master' into 1.16 2020-05-21 03:08:25 -03:00
gnembon 706ddb546a 1.3.24 2020-05-21 03:07:08 -03:00
gnembon bec5259216 20w21a ohboi 2020-05-21 02:59:17 -03:00
gnembon 838211edba Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/utils/BlockInfo.java
2020-05-20 10:41:04 -03:00
gnembon 864c9450f7 renamed vine to vegetation and redstone_bits to decoration 2020-05-20 10:40:01 -03:00
gnembon b51078e427 mappings 2020-05-20 10:31:06 -03:00
gnembon abd5f178be Merge branch 'master' into 1.16 2020-05-20 02:13:37 -03:00
gnembon 934038828c handled errors in server docked tasks to continue stack trace of internal exceptions. 2020-05-20 02:13:12 -03:00
gnembon ab86fc9292 added 'portal_cooldown' and 'portal_timer' to entity API (query and modify) 2020-05-20 02:09:57 -03:00
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 cbeb75c8ed fix 2020-05-18 23:02:49 -03:00
gnembon dcac57a1a2 Merge branch 'master' into 1.16
# Conflicts:
#	src/main/java/carpet/mixins/ServerPlayerEntity_scarpetEventMixin.java
2020-05-18 22:18:29 -03:00
gnembon 7d1385b7cc Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2020-05-18 22:14:26 -03:00
gnembon 0a7b231a63 added add_chunk_ticket 2020-05-18 22:14:07 -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 aabfda3797 Merge branch 'master' into 1.16 2020-05-15 20:00:55 -03:00
gnembon 74c62e5a13 simplified translations keys 2020-05-15 20:00:27 -03:00
gnembon 68093ed54a Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2020-05-15 22:04:33 -03:00
gnembon 1e39f6caa8 updates to translations 2020-05-15 17:26:36 -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 77d819487e 20w20b 2020-05-14 12:51:46 -03:00
gnembon e9c72ac4fe Merge branch 'master' into 1.16
# Conflicts:
#	gradle.properties
2020-05-14 12:45:59 -03:00
gnembon 2265d87db2 loader verbump 2020-05-14 12:45:22 -03:00
gnembon e8c73f4f5e oupsie, 20w20a contd 2020-05-13 17:09:46 -03:00
gnembon dfd88b7142 20w20a 2020-05-13 16:58:12 -03:00
gnembon 903fe1e31a Merge branch 'master' into 1.16 2020-05-13 10:37:27 -03:00
gnembon 743a57de90 1.3.23 2020-05-13 10:36:10 -03:00
gnembon 9afd1f3211 validators to creative movement controls 2020-05-13 10:33:43 -03:00
gnembon a94596fb32 removed double initialization from SP 2020-05-13 10:01:58 -03:00
gnembon 1435b098e7 removed villager unnecessary info about workstations 2020-05-13 10:01:22 -03:00
gnembon 3e0cd65434 fixed entity 'home' arguments 2020-05-13 09:28:44 -03:00
gnembon a4750f7238 fixed entity 'home' arguments 2020-05-12 23:28:34 -03:00
gnembon e5aea149cf Merge branch 'master' into 1.16 2020-05-12 23:04:04 -03:00
gnembon 6ce64cb37a Merge branch 'master' into 1.16 2020-05-12 15:29:51 -03:00
gnembon 849a7b8eeb merge changes to full.md 2020-05-12 15:29:36 -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 955eb361f4 added 'all' options to spawn entites and fixed definition of mobcappable 2020-05-12 17:00:02 -03:00
gnembon 5cee4e9958 explosion - added entity context. 2020-05-12 14:16:19 -03:00
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 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