Commit Graph
242 Commits
Author SHA1 Message Date
gnembon 941b7d4836 Merge branch 'master' into 1.17 2020-12-20 19:27:04 -04:00
gnembon f54ab746fe player swinging events. 2020-12-20 18:34:43 -04:00
gnembon c2436f1f09 Merge branch 'master' into 1.17 2020-12-16 18:04:52 -04:00
replaceitem 6bb7eb2ae2 Merge branch 'master' into scoreboard-criterion-mod 2020-12-16 20:40:29 +01:00
replaceitem 055c26d44a added changing criterion to scoreboard_add #624 2020-12-16 20:35:28 +01:00
gnembon 5280cda3ee set can now accept map of properties. 2020-12-16 02:05:05 -04:00
gnembon 50a0e4b886 Merge branch 'master' into 1.17 2020-12-14 02:37:48 -04:00
gnembon cd892f95bc cleaner 2020-12-14 02:36:53 -04:00
gnembon e89f4444dc Merge branch 'master' into 1.17 2020-12-13 06:31:17 -04:00
Kevin Delugan 2be4ac8ee0 Added onTrade Scarpet Event 2020-12-11 05:19:06 +01:00
gnembon 947474e9e9 Merge branch 'master' into 1.17 2020-12-07 22:13:45 -04:00
gnembon f54a098948 allow apps define their own command permission level, fixes #542 2020-12-07 16:03:42 -04:00
Ghoulboy bf0b75ebff adding dev_environment (#615) 2020-12-07 08:39:04 -04:00
gnembon 02a25c0c99 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/api/Entities.java
2020-12-07 01:14:12 -04:00
gnembon 522d971688 added startup and shutdown events. fixes #586 2020-12-07 01:11:55 -04:00
gnembon a0067d0d61 added item_list, item_tags to support item tags as well as options for entities to support entity type tags. fixes #382 2020-12-07 00:12:55 -04:00
gnembon ac6b3c7f48 apps can be organized in floders in your shared instance space. 2020-12-06 23:40:02 -04:00
gnembon 89e61db56e Merge branch 'master' into 1.17 2020-12-06 20:36:40 -04:00
Ghoulboy 49e5c012b3 Adding Gamerule modification to scarpet (#610) 2020-12-06 20:32:29 -04:00
gnembon 56064a49cb fixes to xp stuff, saturation and weather 2020-12-06 19:55:01 -04:00
Ghoulboy 42e67f27b7 Adding absorption and xp API, and weather control (#540)
* fixes #537
* fixes  #547
2020-12-06 16:03:15 -04:00
gnembon 28e84dd64e entity_area can accept entity as a starting bounding box. 2020-12-05 22:41:15 -04:00
gnembon 1e1b4c5406 fix wording of docs 2020-12-05 21:56:37 -04:00
gnembon 59b752e6c9 better messaging on handling of unknown functions. fixes #606 2020-12-04 22:02:01 -04:00
gnembon 9d08c54324 Merge branch 'master' into 1.17 2020-12-03 22:25:51 -04:00
gnembon 6e5af5bfc8 added list_files, fixes #589 2020-12-03 04:05:11 -04:00
gnembon 259bdc2c94 ability to query client brand and server scarpet version. 2020-12-02 22:36:20 -04:00
gnembon 0bacbcc2f5 Merge branch 'master' into 1.17 2020-12-02 13:23:32 -04:00
gnembon d29f49967f rework of the event system, allowing apps to function more independently and allowing for player scoped apps to handle global events. fixes #596 2020-12-02 01:02:36 -04:00
replaceitem 3a2edb9ed2 Added scarpet bossbar function (#585) 2020-11-30 11:12:04 -04:00
gnembon 91bff6a513 Merge branch 'master' into 1.17 2020-11-30 01:43:09 -04:00
gnembon d980ab6d91 added blockpredicate argument support 2020-11-29 19:34:40 -04:00
gnembon b10280fd31 Merge pull request #590 from altrisi/global-apps
Allow loading apps from a global path
2020-11-29 18:17:07 -04:00
altrisi 5dfd956ba2 Only allow globals in clients, fix potential issue and mention in docs 2020-11-29 21:45:53 +01:00
gnembon 3ea5190fd6 Merge branch 'master' into 1.17 2020-11-29 15:54:54 -04:00
gnembon 463bc8e0aa clarifications 2020-11-29 09:52:57 -04:00
gnembon 596586fe00 clarifications 2020-11-29 03:15:28 -04:00
gnembon 973dd29739 Merge branch 'master' into 1.17
# Conflicts:
#	gradle.properties
#	src/main/java/carpet/script/value/ValueConversions.java
2020-11-29 01:23:22 -04:00
gnembon e15afd9763 added support for block predicate argument support and tag_matches function. Fixes #563 2020-11-29 00:33:01 -04:00
altrisi ce0cca4005 [Scarpet] Add display_title function (#555) 2020-11-28 21:40:16 -04:00
KingOfTheClouds 1abe93f0dc Fix scarpet modify(e, 'effect', ...) (#587) 2020-11-28 21:21:21 -04:00
gnembon 2552887340 Merge branch 'master' into 1.17 2020-11-28 19:03:39 -04:00
gnembon 5a8ce26c44 'biome' query api 2020-11-28 19:02:58 -04:00
gnembon 4f7ebdd9ff Merge branch 'master' into 1.17 2020-11-28 12:13:07 -04:00
gnembon b13c59eedf added block_list and block_tags to handle block tags. 2020-11-28 02:29:26 -04:00
gnembon 083d2a7f2e plop with no args returns all available structures and features. 2020-11-28 01:44:16 -04:00
gnembon 45e3abf19c fix to handle invalid structures with invalid boxes. 2020-11-28 01:24:49 -04:00
gnembon 6206753198 block_state can accept string block name as well. 2020-11-27 15:50:57 -04:00
gnembon 8d930ac72e Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2020-11-27 00:34:41 -04:00
gnembon a099ed79e1 added player_escapes_sleep event. Fixes #579 2020-11-27 00:34:24 -04:00