Commit Graph
2792 Commits
Author SHA1 Message Date
gnembon 7063d542ff 1.4.35 2021-05-05 20:19:18 -03:00
github-actions[bot] 0a9729b381 Merge docs for 'Carpet Mod 1.4.35 for Minecraft 1.16.5 and Minecraft 21w18a' 2021-05-05 20:40:31 +00:00
gnembon 4d15e07bae merge conflcts 2021-05-05 08:38:38 -03:00
gnembon 874b177da6 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/patches/EntityPlayerMPFake.java
2021-05-05 08:34:22 -03:00
gnembon d3aac224ff allow to spawn players when profile servers are down. 2021-05-05 08:33:47 -03:00
gnembon 5ac22aa000 mapping 2021-05-05 01:50:04 -03:00
gnembon e4ebeda1d0 mapping 2021-05-05 01:44:05 -03:00
gnembon 820c9b6489 Merge branch 'master' into 1.17 2021-05-05 01:31:00 -03:00
gnembon dfb1435e67 Merge pull request #836 from whats2000/patch-3
Update zh_tw.json
2021-05-05 01:30:13 -03:00
gnembon cf62890a3a Merge pull request #841 from replaceitem/text-bool-fix
Fixed boolean value of FormattedText being incorrect
2021-05-05 01:28:16 -03:00
gnembon 0f81be2e8e Merge pull request #844 from gnembon/expression_optimizer
Expression optimizer
2021-05-05 01:28:01 -03:00
gnembon 1633cca07a better reporting 2021-05-05 01:23:17 -03:00
gnembon 8d97ab26a9 script compile time optimizations. 2021-05-05 00:25:31 -03:00
replaceitem 659ad2408e Fixed boolean value of FormattedText being incorrect 2021-05-04 20:26:20 +02:00
whats2000 c465976609 Update zh_tw.json
small fix
2021-05-02 23:35:23 +08:00
whats2000 6eee47ec14 Update zh_tw.json
Add new translation to support the latest version
2021-05-02 23:22:44 +08:00
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
github-actions[bot] eb5fd951ef Merge docs for 'Carpet Mod 1.4.34 for Minecraft 1.16.5 and Minecraft 21w17a' 2021-04-28 17:28:43 +00: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