icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,712 Commits 1 Branch 0 Tags
62f2b973030bc1be5fd5a87f193fd3ec184baa5c
Commit Graph
456 Commits
Author SHA1 Message Date
gnembon 43bb7eb11a Merge branch 'master' into 1.17 2021-04-23 10:58:55 -03:00
gnembon e22474156b maps unpack 2021-04-23 10:58:33 -03:00
gnembon 5e3812e1f0 Merge branch 'master' into 1.17 
# Conflicts:
#	src/main/java/carpet/script/api/Auxiliary.java
#	src/main/java/carpet/script/api/Entities.java
#	src/main/java/carpet/script/api/Inventories.java
#	src/main/java/carpet/script/api/Scoreboards.java
#	src/main/java/carpet/script/api/WorldAccess.java
#	src/main/java/carpet/script/value/FunctionValue.java
#	src/main/java/carpet/script/value/NBTSerializableValue.java
 2021-04-23 01:46:11 -03:00
gnembon 5ec664240f Merge pull request #828 from gnembon/unpacker 
Unpacker
 2021-04-23 01:30:29 -03:00
gnembon bed9e2c60a docs 2021-04-23 01:20:42 -03:00
github-actions[bot] ba2429e29d Merge docs for 'Carpet Mod 1.4.33 for Minecraft 1.16.5 and Minecraft 21w16a' 2021-04-21 23:16:24 +00:00
gnembon 400ed75b31 Merge branch 'master' into 1.17 2021-04-19 09:33:26 -03:00
gnembon 6677c538fa simple 2021-04-19 09:32:33 -03:00
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
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
altrisiandgnembon 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 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 a106f2611f Update docs 2021-04-17 11:48:05 +02:00
replaceitemandgnembon 472e1be663 replace 'header' with 'player_list' 
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
 2021-04-17 11:41:15 +02: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
github-actions[bot] 4e10eaa5da Merge docs for 'Carpet Mod 1.4.32 for Minecraft 1.16.5 and Minecraft 21w15a' 2021-04-14 18:32:19 +00:00
gnembon b7cb73d38b Merge branch 'master' into 1.17 2021-04-13 09:10:06 -03:00
gnembon 51db851096 docs 2021-04-13 09:03:24 -03:00
BisUmTo 58436fc022 More datapack examples (#805) 
* Update Auxiliary.md

* Fixed players() TYPO
 2021-04-13 08:55:58 -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
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
BisUmToJames103gnembon
 		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
github-actions[bot] 8373a4611d Merge docs for 'Carpet Mod 1.4.31 for Minecraft 1.16.5 and Minecraft 21w14a' 2021-04-07 19:23:15 +00: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 8f5330e241 added system_info world_spawn_point. Fixes #785 2021-04-04 17:55:57 -03:00
gnembon 3f372180e6 increased store for random seeds to 64k 2021-04-04 12:33:52 -03:00
gnembon da2873de52 Merge branch 'master' into 1.17 2021-04-03 20:31:35 -03:00
github-actions[bot] 4ad1c3e029 Merge docs for 'Carpet Mod 1.4.30 for Minecraft 1.16.5, 21w13a' 2021-03-31 22:19:33 +00: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 03e0e72c8c Merge branch 'master' into 1.17 2021-03-25 14:03:29 -03:00
gnembon 1ef764b9b1 specify 2021-03-25 14:03:09 -03:00
gnembon 4616bf4333 Merge branch 'master' into 1.17 
# Conflicts:
#	src/main/java/carpet/script/bundled/FileModule.java
 2021-03-21 02:35:43 -03:00
gnembon 47f9efb0f2 extended info provided with system_info 2021-03-21 02:33:24 -03:00
gnembon 1a47f4333f refactored file IO and zupport for sips 2021-03-20 06:22:23 -03:00
gnembon 4fce03b17d Merge branch 'master' into 1.17 2021-03-18 00:59:11 -03:00
gnembon 087312abfa deprecating 'line' parameter for shapes 2021-03-18 00:58:38 -03:00
gnembon e795a38b17 Merge branch 'master' into 1.17 
# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java
 2021-03-18 00:52:13 -03:00
gnembon 4fdee473f0 added lean and turn to labels 2021-03-18 00:49:21 -03:00
gnembon 98745a7341 Merge branch 'master' into 1.17 2021-03-14 03:17:06 -03:00
replaceitem 15c5c8753f Optimizing scoreboard API with scoreboard_property (#753) 
* Adding scoreboard_property, deprecating scoreboard_remove

* Docs

* Editor keywords

* Whoops

* adding scoreboard_remove back

* Making rendertype snake case

* Double scoreboard_remove

* Removed deprecation
 2021-03-14 03:12:29 -03:00
gnembon e81f3d9629 sound and particle with now arguments now return list of available options. 2021-03-14 01:59:04 -04:00
gnembon 255cb6b96a Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-03-12 06:12:48 -04:00
gnembon eab24f7896 added reset_seed 2021-03-12 06:11:55 -04:00