Commit Graph
1257 Commits
Author SHA1 Message Date
gnembon 6594c2c07f Merge branch 'master' into future 2021-08-08 21:51:42 -03:00
altrisi 7fb5e47da5 Use newer Java features in places where it makes sense and more (#1009) 2021-08-03 07:32:40 -03:00
altrisi 2a391962ff Remove no longer needed Mixins (#1030) 2021-07-26 09:20:01 -03:00
gnembon 0e9df3701f rework for events and other stored functions. Fixes #984 2021-07-22 22:22:38 -03:00
altrisi 7ebc990ef6 Use pattern matching for instanceof (#1019) 2021-07-21 22:24:24 -03:00
gnembon 97e7d660e4 fix inventories for armorstands, fixes #1017 2021-07-21 09:09:50 -03:00
gnembon 9cdc297314 1.18 exp1 2021-07-14 01:07:19 -03:00
gnembon b85311e3bf Merge branch 'master' into future
# Conflicts:
#	gradle.properties
2021-07-14 00:58:12 -03:00
gnembon 4dd3cc7fd6 mappings 2021-07-14 00:57:37 -03:00
gnembon 4062a980f6 WIP 1.18 2021-07-14 00:53:24 -03:00
gnembon af368a159d Merge branch '1.17' 2021-07-14 00:26:22 -03:00
gnembon 834da208b6 added ability to offset by axis. Fixes #987 2021-07-11 08:01:51 -03:00
altrisi cca9d2ec7e Provide script download suggestions async (#986) 2021-07-11 07:43:11 -03:00
gnembon 41a34b52a3 Merge branch 'master' into 1.17 2021-07-10 23:26:38 -03:00
gnembon 0c5f828b3b unused 2021-07-10 02:18:55 -03:00
gnembon a9a119e172 default foliage color has to be fixed on the server since its actually part of client resourcepack. Fixes #992 2021-07-09 22:16:29 -03:00
gnembon 33500dde29 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/api/Auxiliary.java
#	src/main/java/carpet/script/api/Inventories.java
#	src/main/java/carpet/script/api/WorldAccess.java
#	src/main/java/carpet/script/value/EntityValue.java
2021-07-05 16:53:01 -03:00
gnembon d07fe18bb5 handle invalid identifiers, fixes #980 2021-07-05 16:52:08 -03:00
gnembon 4f77327b6c Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/script/utils/AppStoreManager.java
2021-06-30 13:33:10 -03:00
altrisi 97e69d347e Change how resource type works, allow proper app and library installation (#956)
* Change how app store types work, allow proper app and library installation

* Add node for resources in dependencies and docs

* Fix NPE without `type`

* Fix docs trying to change location of app type resource

* Separate libraries and apps and add trash for them

* Update docs

* Create trash directory if it doesn't exist
2021-06-30 12:42:24 -03:00
gnembon 9a4e15da48 mappings 2021-06-29 17:28:58 -03:00
gnembon ca59c8f30a reloading chunks is not needed when resetting, fixing entities removed. 2021-06-29 02:21:47 -03:00
gnembon b8082ba5b8 Merge branch 'master' into 1.17 2021-06-29 02:07:39 -03:00
gnembon 25176f9d43 Merge branch 'master' of https://github.com/gnembon/fabric-carpet 2021-06-29 02:07:13 -03:00
gnembon 35a97117fe annoying, fixes #963 2021-06-29 02:07:07 -03:00
replaceitem 83afa95d98 Fixed team color using client method (#965) 2021-06-28 22:52:40 -03:00
gnembon 54c6ef1ec1 Merge branch 'master' into 1.17 2021-06-27 23:15:57 -03:00
altrisi cd50919a90 Filter script download suggestions according to player input (#958) 2021-06-27 22:33:13 -03:00
gnembon 092766b820 Merge branch 'master' into 1.17 2021-06-26 23:20:30 -03:00
gnembon b1b7956ea9 added chunk_loaded event and fixed handling these events on 1.17 2021-06-26 23:20:13 -03:00
gnembon 1a152ce20a Merge branch 'master' into 1.17 2021-06-25 23:50:39 -03:00
gnembon 8fa54c8146 stack overflow in scripts shouldn't crash the game, fixes #934 2021-06-25 23:31:46 -03:00
gnembon 3073bcfe4b Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/logging/HUDController.java
2021-06-25 22:45:49 -03:00
gnembon 096e62b865 removes retained player references, Fixes #953 2021-06-25 22:44:01 -03:00
gnembon ac24a67c00 changes to entity load handler keeping it backwards compatible. Fixes #929 2021-06-25 20:18:12 -03:00
gnembon 2127c3ac8e Merge branch 'master' into 1.17
# Conflicts:
#	src/main/java/carpet/mixins/ServerWorld_scarpetMixin.java
#	src/main/java/carpet/script/CarpetEventServer.java
2021-06-25 20:12:45 -03:00
gnembon 448fde1f36 changes to entity load handler keeping it backwards compatible 2021-06-25 20:09:15 -03:00
gnembon 481fc97545 changes to entity load handler / not backwards compatible 2021-06-25 18:38:49 -03:00
gnembon 85d60b283f more flexible dealing with custom argument types, allowing _ in custom types. Fixes #936 2021-06-23 13:36:14 -03:00
gnembon f2aae4ec92 added is_freezing, frost, immune_to_frost to entity API, Fixes #932 2021-06-23 13:18:45 -03:00
gnembon 8314072f9d Merge branch 'master' into 1.17 2021-06-23 13:37:29 -03:00
gnembon 6b2577d3b4 scarpet app command system will warn on repeated arguments. Fixes #935 2021-06-23 04:21:50 -03:00
gnembon 1aacfead38 Merge branch 'master' into 1.17 2021-06-22 15:03:27 -03:00
gnembon 1a068cb22a added missing type classification. Fixes #947 2021-06-22 14:59:23 -03:00
gnembon 26f9badb95 classified marker 2021-06-22 14:56:07 -03:00
gnembon 127416c8c1 fixed glow item frame classification. fixes #933 2021-06-22 01:44:03 -03:00
gnembon 241537b172 Merge branch 'master' into 1.17
# Conflicts:
#	src/main/resources/carpet.mixins.json
2021-06-22 01:28:32 -03:00
gnembon cf6eb2c7d6 issues with mocked inventories, fixes #946 2021-06-22 00:35:03 -03:00
gnembon 01aeb79617 Merge branch 'master' into 1.17 2021-06-20 00:15:45 -03:00
altrisi 7975ab65cd A bit more nio and log IO errors (#920)
* A bit more nio and log IO errors

* Use Scarpet logger
2021-06-19 11:59:56 -03:00