 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 |
|
|
gnembon
|
0937ba8352
|
1.17.1-pre1
|
2021-06-18 23:43:47 -03:00 |
|
|
gnembon
|
b581c3bea6
|
well
|
2021-06-17 21:21:59 -03:00 |
|
|
gnembon
|
3ff7e1d4cb
|
Merge branch 'master' into 1.17
|
2021-06-17 21:20:53 -03:00 |
|
|
gnembon
|
3a83a94361
|
added despawn timer
|
2021-06-17 21:20:11 -03:00 |
|
|
gnembon
|
dc38cd272f
|
Merge branch 'master' into 1.17
# Conflicts:
# src/main/resources/carpet.mixins.json
|
2021-06-13 11:47:56 -03:00 |
|
|
gnembon
|
d29adf3a48
|
whatever, Fixes #895
|
2021-06-11 03:41:44 -03:00 |
|
|
gnembon
|
c36f9bfb9f
|
better
|
2021-06-11 00:42:49 -03:00 |
|
|
gnembon
|
a7770abf9d
|
better
|
2021-06-11 00:39:40 -03:00 |
|
|
gnembon
|
7ee313134e
|
Pulling in from empty list container returns null like for other containers. Fixes #660
|
2021-06-11 00:37:45 -03:00 |
|
|
gnembon
|
8297000b88
|
Fixes clingon messaging with broken argument lists. Fixes #638.
|
2021-06-11 00:20:09 -03:00 |
|
|
gnembon
|
cef1dd4f8e
|
Merge branch 'master' into 1.17
|
2021-06-01 03:54:07 -03:00 |
|
|
gnembon
|
0308124f00
|
just to be clean
|
2021-06-01 03:53:48 -03:00 |
|
|
gnembon
|
875545711b
|
Merge branch 'master' into 1.17
|
2021-06-01 01:08:19 -03:00 |
|
|
altrisi
|
8f5667c244
|
Fix Value detection in ValueConverter selection (#896)
|
2021-05-31 21:59:15 -03:00 |
|
|
gnembon
|
5f630e7d1a
|
Merge branch 'master' into 1.17
|
2021-05-31 15:54:32 -03:00 |
|
|
altrisi
|
b359c6c76c
|
Implement @Locator.Function and @Locator.Vec3d (#891)
* Implemente `@Locator.Function`
* Implement `@Locator.Vec3d`
* Small import cleanup
* Javadoc
|
2021-05-31 15:51:10 -03:00 |
|
|
gnembon
|
83109eda9a
|
Merge branch 'master' into 1.17
|
2021-05-28 13:51:09 -03:00 |
|
|
gnembon
|
bd689b418a
|
prevent events to be called when script server is gone.
|
2021-05-28 13:50:50 -03:00 |
|
|
gnembon
|
f64cf67e41
|
1.17-pre1
|
2021-05-27 15:01:07 -03:00 |
|
|
gnembon
|
e2dfbc5bdd
|
Merge branch 'master' into 1.17
|
2021-05-27 01:56:13 -03:00 |
|
|
gnembon
|
328ded0537
|
added /script remove app command
|
2021-05-27 01:54:26 -03:00 |
|
|
gnembon
|
b96a1b1216
|
Merge branch 'master' into 1.17
|
2021-05-25 17:25:55 -03:00 |
|
|
gnembon
|
eb927f5e7c
|
Merge branch 'master' of https://github.com/gnembon/fabric-carpet
|
2021-05-25 17:24:29 -03:00 |
|
|
gnembon
|
f18cc1c836
|
more thread safe carpet globs
|
2021-05-25 17:24:14 -03:00 |
|
|
gnembon
|
c3fe5d685b
|
Merge pull request #884 from altrisi/annotated-block-locator
Implement `@Locator.Block`
|
2021-05-25 13:17:28 -03:00 |
|
|
gnembon
|
d6bde212e2
|
Merge branch 'master' into 1.17
|
2021-05-25 07:45:58 -03:00 |
|
|
gnembon
|
5d00709b1f
|
fix for downloadable zip folders
|
2021-05-25 07:31:22 -03:00 |
|
|
gnembon
|
c720c2c935
|
Merge branch 'master' into 1.17
# Conflicts:
# src/main/java/carpet/script/api/Auxiliary.java
# src/main/java/carpet/script/utils/ShapeDispatcher.java
# src/main/java/carpet/script/value/EntityValue.java
# src/main/java/carpet/script/value/ListValue.java
|
2021-05-25 01:08:32 -03:00 |
|
|
gnembon
|
0df2b30a00
|
Merge pull request #883 from altrisi/annotated-edits
Allow static methods for Scarpet Functions
|
2021-05-25 00:51:28 -03:00 |
|
|
gnembon
|
7b4176f717
|
Merge pull request #882 from altrisi/not-fromItemStack
Replace usages of deprecated ListValue::fromItemStack and remove it
|
2021-05-25 00:50:53 -03:00 |
|
|
gnembon
|
c60167405d
|
Merge pull request #881 from altrisi/deprecate-old-booleans
Deprecate old boolean constructor and move existing usages
|
2021-05-25 00:50:11 -03:00 |
|
|
gnembon
|
5331d9810a
|
Merge pull request #880 from altrisi/primitives-and-exhaustion
Use primitive doubles in `NumericValue` and allow adding exhaustion with floats
|
2021-05-25 00:47:26 -03:00 |
|
|
gnembon
|
cab37358ed
|
Merge branch 'master' into 1.17
|
2021-05-25 00:41:29 -03:00 |
|
|
gnembon
|
db9039c02a
|
added app resources for apps from appstores
|
2021-05-25 00:41:06 -03:00 |
|
|
altrisi
|
adee06ad3f
|
Mention custom converters in Param javadoc, make a few things final and remove commented out LazyValue provider
|
2021-05-24 14:51:14 +02:00 |
|
|
altrisi
|
aeba4520d4
|
Fix missing type in javadoc of @Locator.Block
|
2021-05-24 14:18:33 +02:00 |
|
|
altrisi
|
ca1828d797
|
Allow more parameter types in @Locator.Block
|
2021-05-24 14:14:03 +02:00 |
|
|
altrisi
|
7f2cb0f4a7
|
Implement @Locator.Block
|
2021-05-24 13:04:51 +02:00 |
|
|
altrisi
|
05ff870d0b
|
Allow static methods for Scarpet Functions
What was I thinking?
|
2021-05-24 12:40:20 +02:00 |
|
|
altrisi
|
2b3f376871
|
Replace usages of deprecated ListValue::fromItemStack and remove it
|
2021-05-24 12:00:55 +02:00 |
|
|
altrisi
|
9d9844fd5d
|
Deprecate old boolean constructor and move existing usages
|
2021-05-24 11:41:24 +02:00 |
|
|
altrisi
|
f34503aa3c
|
Use primitive doubles and allow decimal exhaustion
|
2021-05-24 11:21:39 +02:00 |
|
|
gnembon
|
93b8d98a79
|
Merge branch 'master' into 1.17
|
2021-05-23 14:01:18 -03:00 |
|
|
gnembon
|
1b39feaab7
|
wrap stream before closing zip files.
|
2021-05-23 14:00:49 -03:00 |
|
|
gnembon
|
95d8c5fd90
|
Merge branch 'master' into 1.17
|
2021-05-22 22:14:43 -03:00 |
|
|
gnembon
|
c6db496a1f
|
fixes behaviour of folder and file detections in java 16, fixes #869
|
2021-05-22 01:57:04 -03:00 |
|