Commit Graph
2475 Commits
Author SHA1 Message Date
gnembon 0367170bac Merge branch 'master' into 1.17 2021-04-29 02:17:17 -03:00
gnembon 06c9aea326 tracking module integrity when module composition changes 2021-04-29 02:17:02 -03:00
gnembon b84478e7db 21w17a 2021-04-28 17:05:42 -03:00
gnembon 624f9973c8 Merge branch 'master' into 1.17 2021-04-28 16:50:45 -03:00
gnembon f8c3de21d3 1.4.34 2021-04-28 16:48:46 -03:00
gnembon 99e8db192a mappings 2021-04-28 01:42:49 -03:00
gnembon 988357317a Merge branch 'master' into 1.17 2021-04-26 23:29:27 -03:00
gnembon 3b3ebee48b Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-04-26 23:28:17 -03:00
gnembon 7da009fe5b docs on '...'. Addresses and fixes #833 2021-04-26 23:27:39 -03:00
gnembon 390c40ae74 little better place 2021-04-27 00:33:43 -03:00
gnembon d1e106bf82 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-04-27 00:24:40 -03:00
Ghoulboy 164122eba2 Adding query player language (#824) 2021-04-26 21:38:29 -03:00
Ghoulboy 1bc2dd94da Adding b64 and json decoder and encoder functions (#829) 2021-04-26 21:21:35 -03:00
gnembon e8ab5f0d50 Merge branch 'master' into 1.17 2021-04-25 00:50:22 -03:00
gnembon 33c0cc6979 damage can also be reported if its == 0. Might be useful 2021-04-25 00:50:06 -03:00
gnembon 31afc28401 Merge branch 'master' into 1.17 2021-04-24 01:13:57 -03:00
gnembon 28101e716b lists are now properly mutable 2021-04-24 01:13:33 -03:00
gnembon d388c406fd lists are now properly mutable 2021-04-24 00:30:51 -03:00
gnembon ea660b954f Merge branch 'master' into 1.17 2021-04-23 22:13:26 -03:00
gnembon 9e7d6b70b7 thread exceptions are printed unscrambled 2021-04-23 22:12:38 -03:00
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