 github-actions[bot]
|
c7554c888e
|
Merge docs for 'adding dev_environment (#615)'
|
2020-12-07 12:39:25 +00:00 |
|
|
Ghoulboy
|
bf0b75ebff
|
adding dev_environment (#615)
|
2020-12-07 08:39:04 -04:00 |
|
|
Ghoulboy
|
990a377f0b
|
Adding convert_date and unix_time to docs (#614)
|
2020-12-07 08:38:02 -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 |
|
|
github-actions[bot]
|
fb2602eea8
|
Merge docs for 'added startup and shutdown events. fixes #586'
|
2020-12-07 05:12:40 +00:00 |
|
|
gnembon
|
522d971688
|
added startup and shutdown events. fixes #586
|
2020-12-07 01:11:55 -04:00 |
|
|
github-actions[bot]
|
f400c9c006
|
Merge docs for '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 04:16:59 +00: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 |
|
|
github-actions[bot]
|
f287532765
|
Merge docs for 'Adding Gamerule modification to scarpet (#610)'
|
2020-12-07 00:32:56 +00:00 |
|
|
Ghoulboy
|
49e5c012b3
|
Adding Gamerule modification to scarpet (#610)
|
2020-12-06 20:32:29 -04:00 |
|
|
github-actions[bot]
|
b318f1fb68
|
Merge docs for 'fixes to xp stuff, saturation and weather'
|
2020-12-06 23:55:24 +00:00 |
|
|
gnembon
|
56064a49cb
|
fixes to xp stuff, saturation and weather
|
2020-12-06 19:55:01 -04:00 |
|
|
github-actions[bot]
|
68560c7c5e
|
Merge docs for 'Adding absorption and xp API, and weather control (#540)
* fixes #537
* fixes #547'
|
2020-12-06 20:04:59 +00:00 |
|
|
Ghoulboy
|
42e67f27b7
|
Adding absorption and xp API, and weather control (#540)
* fixes #537
* fixes #547
|
2020-12-06 16:03:15 -04:00 |
|
|
github-actions[bot]
|
8acb322747
|
Merge docs for 'entity_area can accept entity as a starting bounding box.'
|
2020-12-06 02:41:44 +00:00 |
|
|
gnembon
|
28e84dd64e
|
entity_area can accept entity as a starting bounding box.
|
2020-12-05 22:41:15 -04:00 |
|
|
github-actions[bot]
|
3318d15dab
|
Merge docs for 'fix wording of docs'
|
2020-12-06 01:57:03 +00:00 |
|
|
gnembon
|
1e1b4c5406
|
fix wording of docs
|
2020-12-05 21:56:37 -04:00 |
|
|
github-actions[bot]
|
8bf1bf6b41
|
Merge docs for 'Merge pull request #609 from gnembon/module_imports
better messaging on handling of unknown functions. fixes #606'
|
2020-12-05 03:22:18 +00:00 |
|
|
gnembon
|
063a1735a0
|
wording
|
2020-12-04 22:10:15 -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 |
|
|
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 |
|