gnembon
d636965f59
Merge branch 'master' into 1.17
...
# Conflicts:
# src/main/java/carpet/logging/HUDController.java
# src/main/java/carpet/script/api/Auxiliary.java
2021-04-19 03:51:32 -03:00
gnembon
fa3505763e
fix
2021-04-19 03:48:37 -03:00
altrisi
1819694d19
Make player_list take arguments one at a time and make it compatible with loggers ( #819 )
...
* Make `player_list` take arguments one at a time and make it compatible with loggers
* Update docs for `player_list` modification
2021-04-19 02:31:54 -03:00
gnembon
3df0e3f277
Merge branch 'master' into 1.17
2021-04-18 02:45:14 -03:00
altrisi and gnembon
b7b7667484
Allow apps to specify mod version requirements ( #798 )
...
* Allow apps to specify mod version requirements
* Allow a function in requires field and move to `readConfig()`
* Add `server_mods` to system_info()
* Add prefixes and default to `=`
* Added docs for `requires` and for `system_info('server_mods')`
* Better docs for requires (mention * and available prefixes)
* Update docs/scarpet/api/Overview.md
* Update docs/scarpet/api/Overview.md
* Update docs/scarpet/api/Overview.md
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com >
2021-04-18 02:36:29 -03:00
gnembon
ee6ea80ce6
update
2021-04-18 01:56:59 -03:00
gnembon
9120aae313
Merge branch 'master' into 1.17
...
# Conflicts:
# src/main/java/carpet/script/api/Auxiliary.java
2021-04-18 01:50:29 -03:00
gnembon
0e84ef5d65
Merge pull request #750 from replaceitem/display-title-additions
...
Added player_list option to display_title()
2021-04-18 01:36:49 -03:00
replaceitem
eaa242c8eb
Added option to only set footer, and clear both
2021-04-17 12:33:31 +02:00
replaceitem
53fc6fab9c
Removed 'motd'
2021-04-17 11:47:53 +02:00
replaceitem and gnembon
794a80e4d4
update exception
...
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com >
2021-04-17 11:42:02 +02:00
replaceitem and gnembon
fad68163c2
player_list
...
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com >
2021-04-17 11:41:33 +02:00
gnembon
8f2c935fe6
Merge branch 'master' into 1.17
...
# Conflicts:
# src/main/java/carpet/network/ClientNetworkHandler.java
# src/main/resources/assets/carpet/scripts/ai_tracker.sc
2021-04-17 01:37:40 -03:00
gnembon
38285d4221
running functions will cause them not track the commandsource. fixes #815
2021-04-17 00:29:13 -03:00
gnembon
0dd88cd1dc
Merge branch 'master' into 1.17
...
# Conflicts:
# src/main/java/carpet/utils/WoolTool.java
2021-04-15 14:49:17 -03:00
gnembon
6f13b9068e
running execute store had no effect, fixes #809
2021-04-14 21:19:10 -03:00
gnembon
cc3723ae12
mapping
2021-04-13 19:54:23 -03:00
gnembon
3d4fa6ae89
Merge branch 'master' into 1.17
2021-04-13 01:23:22 -03:00
gnembon
f2721ab87a
custom events backend, and entity attribute query.
2021-04-13 01:22:50 -03:00
gnembon
8ed4561a98
Merge branch 'master' into 1.17
...
# Conflicts:
# src/main/java/carpet/script/utils/ShapeDispatcher.java
2021-04-12 14:26:22 -03:00
gnembon
40869ef9bf
moved custom arguments to before the commands and handled missing functions nicely.
2021-04-12 14:24:10 -03:00
gnembon
92cc545896
less restricting use of shapes
2021-04-12 07:57:04 -03:00
replaceitem
396e844dce
Merge branch 'master' into display-title-additions
2021-04-11 21:21:46 +02:00
gnembon
388a3de577
Merge branch 'master' into 1.17
...
# Conflicts:
# src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java
# src/main/java/carpet/script/api/WorldAccess.java
2021-04-09 01:40:38 -03:00
gnembon
e063748e83
added create_explosion and more event handlers.
2021-04-09 01:38:00 -03:00
7b00952653
Added onExplosion Scarpet Event ( #620 )
...
* Added onExplosion Scarpet Event
* Reverted changes to Full.md
* Grammar corrections by James103
Co-authored-by: James103 <37945304+James103@users.noreply.github.com >
* Separated Explosion Mixins
Applied Ghoulboy78 suggestion.
WARNING: 'blocks' list is now empty if 'explosionNoBlockDamage' carpet rule is set to 'true'
* List Value from Triple
Suggested by Gnembon
* Explosion Mixin priority
Suggestion by Gnembon
* Added affectedEntities parameter
* Updated docs
* Optimizing calls
* Update src/main/java/carpet/helpers/OptimizedExplosion.java
* Update docs/scarpet/api/Events.md
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com >
* Update docs/scarpet/api/Events.md
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com >
* Update src/main/java/carpet/mixins/Explosion_scarpetEventMixin.java
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com >
Co-authored-by: James103 <37945304+James103@users.noreply.github.com >
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com >
2021-04-08 18:05:13 -03:00
gnembon
9702262787
Merge pull request #801 from altrisi/exception-constructor-inheritance
...
Chain an exception's constructor
2021-04-07 21:25:45 -03:00
gnembon
8054e0336d
mapping
2021-04-06 23:52:20 -03:00
gnembon
2e3a49756b
mapping
2021-04-06 21:05:34 -03:00
gnembon
0aff2f90c3
Merge branch 'master' into 1.17
2021-04-06 20:59:59 -03:00
gnembon
6fc38d6ec1
slashes fix issues with some java versions
2021-04-06 20:57:14 -03:00
altrisi
5247bb15a8
Inherit an exception's constructor
2021-04-06 22:33:26 +02:00
gnembon
9b9251190b
Merge branch 'master' into 1.17
...
# Conflicts:
# src/main/java/carpet/network/ClientNetworkHandler.java
# src/main/java/carpet/script/utils/ShapesRenderer.java
2021-04-06 00:44:16 -03:00
gnembon
647a3a15b6
profiler rework
2021-04-06 00:41:12 -03:00
gnembon
2ed5861278
Merge branch 'master' into 1.17
2021-04-05 13:42:54 -03:00
gnembon
063b4b84ec
deferred creation of a dummy entity for block breaking to when its needed.
2021-04-05 13:42:22 -03:00
gnembon
214aa45140
Merge branch 'master' into 1.17
2021-04-05 10:59:01 -03:00
gnembon
e37e4050b1
get proper lazy host for execution of suggestions. Fixes #793
2021-04-05 10:58:26 -03:00
gnembon
0cce983092
Merge branch 'master' into 1.17
...
# Conflicts:
# src/main/java/carpet/commands/PerimeterInfoCommand.java
# src/main/resources/carpet.mixins.json
2021-04-04 22:34:38 -03:00
gnembon
f0d044a49f
added scarpet to the carpet profiler
2021-04-04 22:32:34 -03:00
gnembon
9117d85c73
for
2021-04-04 19:45:08 -03:00
gnembon
dafebffb5a
Rewording since all extra semicolons are now stripped in tokenization stage. Fixes #771
2021-04-04 19:22:06 -03:00
gnembon
27612905b8
added system_info world_spawn_point. Fixes #785
2021-04-04 17:54:05 -03:00
gnembon
3f372180e6
increased store for random seeds to 64k
2021-04-04 12:33:52 -03:00
gnembon
5dd2a12aa7
mapping
2021-04-02 18:38:55 -03:00
gnembon
0320de5d6d
21w13a
2021-03-31 22:02:09 -03:00
gnembon
502c4e270e
Merge branch 'master' into 1.17
2021-03-26 22:30:23 -03:00
gnembon
c5f666b95c
specify
2021-03-26 22:29:06 -03:00
gnembon
ab553187c5
its a doozie
2021-03-24 10:35:52 -03:00
gnembon
8be832a74c
Merge branch 'master' into 1.17
2021-03-23 20:15:44 -03:00
gnembon