Commit Graph
260 Commits
Author SHA1 Message Date
gnembon 9d08c54324 Merge branch 'master' into 1.17 2020-12-03 22:25:51 -04:00
github-actions[bot] 33bf24fa86 Merge docs for 'added list_files, fixes #589' 2020-12-03 08:05:37 +00:00
gnembon 6e5af5bfc8 added list_files, fixes #589 2020-12-03 04:05:11 -04:00
github-actions[bot] 6a687177ab Merge docs for 'ability to query client brand and server scarpet version.' 2020-12-03 02:36:49 +00: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
github-actions[bot] bba2a1338b Merge docs for 'Merge pull request #601 from gnembon/rework_events
rework of the event system, fixes #596'
2020-12-02 04:51:01 +00: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
github-actions[bot] 926c1a8e63 Merge docs for 'Added scarpet bossbar function (#585)' 2020-11-30 15:12:27 +00: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
github-actions[bot] e603366d47 Merge docs for 'added blockpredicate argument support' 2020-11-29 23:35:12 +00:00
gnembon d980ab6d91 added blockpredicate argument support 2020-11-29 19:34:40 -04:00
github-actions[bot] 3072b1ddad Merge docs for 'Merge pull request #590 from altrisi/global-apps
Allow loading apps from a global path'
2020-11-29 22:17:25 +00: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
github-actions[bot] eaaf16d089 Merge docs for 'clarifications' 2020-11-29 13:53:49 +00:00
gnembon 463bc8e0aa clarifications 2020-11-29 09:52:57 -04:00
github-actions[bot] 5dfaf12d92 Merge docs for 'clarifications' 2020-11-29 07:15:50 +00: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
github-actions[bot] 08adaaeffd Merge docs for 'added support for block predicate argument support and function. Fixes #563' 2020-11-29 04:33:30 +00:00
gnembon e15afd9763 added support for block predicate argument support and tag_matches function. Fixes #563 2020-11-29 00:33:01 -04:00
github-actions[bot] 0a22c2c375 Merge docs for '[Scarpet] Add display_title function (#555)' 2020-11-29 01:40:33 +00:00
altrisi ce0cca4005 [Scarpet] Add display_title function (#555) 2020-11-28 21:40:16 -04:00
github-actions[bot] 10f027d7fe Merge docs for 'Fix scarpet modify(e, 'effect', ...) (#587)' 2020-11-29 01:21:36 +00: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
github-actions[bot] e78541e5b9 Merge docs for ''biome' query api' 2020-11-28 23:03:23 +00: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
github-actions[bot] f01518a543 Merge docs for 'added and to handle block tags.' 2020-11-28 06:29:51 +00:00
gnembon b13c59eedf added block_list and block_tags to handle block tags. 2020-11-28 02:29:26 -04:00
github-actions[bot] 6ee8d55f88 Merge docs for 'plop with no args returns all available structures and features.' 2020-11-28 05:44:49 +00: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
github-actions[bot] 989bc1ec2b Merge docs for 'Merge branch 'master' of https://github.com/gnembon/fabric-carpet' 2020-11-27 04:35:11 +00: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
github-actions[bot] db99ed26d8 Merge docs for 'Fixed small mistakes in team functions (#580)' 2020-11-27 03:54:26 +00:00
replaceitem 92dcf6648e Fixed small mistakes in team functions (#580) 2020-11-26 23:54:09 -04:00
gnembon f4f289b0ec Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/value/NBTSerializableValue.java
2020-11-26 03:03:03 -04:00
github-actions[bot]andgnembon 2e661a996f Merge docs for 'Added scarpet team functions (#569)
* Added team functions

* Docs for team functions

* Added team functions to editor keywords

* Added static method getPlayerNameByValue to EntityValue (also works with non existing players

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>'
2020-11-26 06:59:49 +00:00
replaceitemandgnembon 210b0fc8ea Added scarpet team functions (#569)
* Added team functions

* Docs for team functions

* Added team functions to editor keywords

* Added static method getPlayerNameByValue to EntityValue (also works with non existing players

Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
2020-11-26 02:59:23 -04:00
github-actions[bot] 1fb4209a15 Merge docs for 'added slot argument type, fixes #564' 2020-11-26 06:53:07 +00:00
gnembon cd3880ea07 added slot argument type, fixes #564 2020-11-26 02:52:41 -04:00
gnembon 79cb4a20d8 refactor for inventories, allowing for null types. 2020-11-26 00:33:09 -04:00
gnembon ba58a99c21 Merge branch 'master' into 1.17 2020-11-25 17:53:00 -04:00