Commit Graph
1972 Commits
Author SHA1 Message Date
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 d8da0b5ed8 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2020-11-29 01:21:19 -04:00
gnembon 735925b48f we don't need these actually 2020-11-29 01:21:11 -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
gnembon 076ad62fad potential NPE issue 2020-11-28 22:23:57 -04:00
gnembon bab7037b80 cleanup 2020-11-28 22:21:38 -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
gnembon 54d306d9bc added biome query to biome 2020-11-28 12:11:31 -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
gnembon 07dce7bc2e risky optimizations. 2020-11-27 02:30:10 -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 42b7af97f5 udpate 2020-11-26 03:06:03 -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 2d92a82ed0 simpler 2020-11-25 22:31:47 -04:00
gnembon 3aee1a7f7f 20w48a 2020-11-25 19:21:56 -04:00
gnembon 8a95db6400 Merge branch 'master' into 1.17 2020-11-25 19:09:57 -04:00
gnembon dd9d6659fb 1.4.19 2020-11-25 19:08:33 -04:00
gnembon ba58a99c21 Merge branch 'master' into 1.17 2020-11-25 17:53:00 -04:00
github-actions[bot] 81b14fd57f Merge docs for 'adding support for equipment inventories as well as horse and pillager item inventories.' 2020-11-25 17:52:43 +00:00
gnembon 201654ff44 adding support for equipment inventories as well as horse and pillager item inventories. 2020-11-25 17:52:17 -04:00
gnembon 253604b34a Merge branch 'master' into 1.17 2020-11-25 02:12:41 -04:00
gnembon 1e7457c27f wording fixes #558 2020-11-25 02:07:46 -04:00
gnembon 53aec581bb simplify affected, not count set failures in draw 2020-11-25 01:50:32 -04:00
gnembon 2a403c36c8 added deprecation warnings, fixes #568 2020-11-25 01:49:56 -04:00
gnembon 5615bddf9b returns false on 'set' when setblock fails. 2020-11-25 00:14:46 -04:00
gnembon 4c6d449553 tweaks to distance beta app 2020-11-24 22:53:45 -04:00
gnembon 209c3b9262 fixed issues with reload and missing command handler 2020-11-24 22:52:05 -04:00
gnembon 724b63df8a using beta as a indicator 2020-11-24 19:43:21 -04:00