 gnembon
|
fb40120460
|
cluenap
|
2021-05-13 02:00:05 -03:00 |
|
|
gnembon
|
65447f09ad
|
Merge branch 'master' into 1.17
# Conflicts:
# src/main/java/carpet/helpers/FeatureGenerator.java
|
2021-05-13 01:52:08 -03:00 |
|
|
gnembon
|
a522e2ae37
|
fixed changed behaviour under java 16
|
2021-05-13 01:51:01 -03:00 |
|
|
gnembon
|
727bdd7b1a
|
21w19a
|
2021-05-12 23:40:09 -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
|
74bd0bb81e
|
dont be lazy refactor
|
2021-04-22 20:37:48 -03:00 |
|
|
gnembon
|
0aff2f90c3
|
Merge branch 'master' into 1.17
|
2021-04-06 20:59:59 -03:00 |
|
|
gnembon
|
6fc38d6ec1
|
slashes fix issues with some java versions
|
2021-04-06 20:57:14 -03:00 |
|
|
gnembon
|
ab553187c5
|
its a doozie
|
2021-03-24 10:35:52 -03:00 |
|
|
gnembon
|
4616bf4333
|
Merge branch 'master' into 1.17
# Conflicts:
# src/main/java/carpet/script/bundled/FileModule.java
|
2021-03-21 02:35:43 -03:00 |
|
|
gnembon
|
53f6a49b8d
|
removed sun's import
|
2021-03-20 17:41:17 -03:00 |
|
|
gnembon
|
ecb578bf49
|
fixed chopped directories names.
|
2021-03-20 17:39:37 -03:00 |
|
|
gnembon
|
1a47f4333f
|
refactored file IO and zupport for sips
|
2021-03-20 06:22:23 -03:00 |
|
|
gnembon
|
0b93101248
|
mapping
|
2021-03-17 10:42:31 -03:00 |
|
|
gnembon
|
57f34a9eac
|
deprecated some IO functions
|
2021-03-17 08:23:56 -03:00 |
|