icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,455 Commits 1 Branch 0 Tags
01387211c2fb7bfcf993bc293776917f64b91094
Commit Graph
2455 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
gnembon 01387211c2 Merge branch 'master' into 1.17 2021-04-23 21:43:42 -03:00
gnembon c476e814b4 better thread handling and removal of unused code. 2021-04-23 21:42:55 -03:00
gnembon 6adb4f7b86 Merge branch '1.17' of https://github.com/gnembon/fabric-carpet into 1.17 2021-04-23 10:59:35 -03:00
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
gnembon edca3fb131 using proper logger now 2021-04-22 22:30:45 -03:00
gnembon d072ec90c3 hold your horses 2021-04-22 22:26:35 -03:00
gnembon a6f39e2d22 scarpet LOG 2021-04-22 22:26:07 -03:00
gnembon 5edbbe3fe2 remane 2021-04-22 22:25:46 -03:00
gnembon 77fbb3af75 Merge branch 'master' into unpacker 2021-04-22 20:37:57 -03:00
gnembon 74bd0bb81e dont be lazy refactor 2021-04-22 20:37:48 -03:00
gnembon e8f135872d fixes #827 2021-04-22 08:41:27 -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 fc87053978 21w16a 2021-04-21 20:12:44 -03:00
gnembon cd6827767a Merge branch 'master' into 1.17 2021-04-21 18:42:50 -03:00
gnembon 8c9dabdbbc 1.4.33 2021-04-21 18:41:39 -03:00
gnembon a65d16c9ba WIP unpacking of parameters. 2021-04-21 12:21:47 -03:00
gnembon db15744737 Merge pull request #820 from altrisi/get-list 
Make `get()` always return a list if requested item ends with `[]`
 2021-04-21 01:43:42 -03:00
altrisi 6083b702f9 Make NBT's get() always return a list if requested item ends with [] 2021-04-21 00:25:14 +02:00
gnembon 72a3d74a97 extremeBehaviours let wither spawn charged skulls at 10%, not 0.1% 2021-04-20 17:35:41 -03:00
replaceitem e26e332a6d Adding getTextByValue method to replace duplicate code (#823) 
* Added FormattedTextValue.getTextByValue()

* changed getBoolean() and added to display_title
 2021-04-20 17:14:08 -03:00
gnembon de92d47f70 Merge pull request #821 from Fallen-Breath/hudcontroller-register-fix 
Fixed missing static keyword at method HUDController.register
 2021-04-20 00:41:39 -03:00
gnembon 8870c245ff mapping 2021-04-20 00:09:00 -03:00
gnembon 4b85bdcb86 merge errors 2021-04-19 23:48:55 -03:00
gnembon 709d74ea47 Merge branch 'master' into 1.17 
# Conflicts:
#	src/main/java/carpet/network/ServerNetworkHandler.java
#	src/main/java/carpet/script/utils/SnoopyCommandSource.java
 2021-04-19 23:42:38 -03:00
gnembon ba89d0164f handling snooped commands properly 2021-04-19 23:40:22 -03:00
gnembon 5cceec9486 Merge branch 'master' into 1.17 2021-04-19 23:35:30 -03:00
gnembon b0dafccc18 re-name 2021-04-19 23:35:13 -03:00
gnembon 0d71d9c0a1 name 2021-04-19 09:35:01 -03: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 3915a5d889 fixed some run command behaviours. 2021-04-19 09:23:42 -03:00
Fallen_Breath c96eee0c1b fixed missing static keyword at method carpet.logging.HUDController.register 2021-04-19 16:01:18 +08:00
gnembon e438fbf56d fix 2021-04-19 03:57:59 -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
gnembon 8ed4c60b9c fix 2021-04-19 03:48:56 -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
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 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 a106f2611f Update docs 2021-04-17 11:48:05 +02:00
replaceitem 53fc6fab9c Removed 'motd' 2021-04-17 11:47:53 +02:00
replaceitemandgnembon 794a80e4d4 update exception 
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
 2021-04-17 11:42:02 +02:00