 gnembon
|
3e3dc3f868
|
fix merge errors
|
2020-04-16 23:32:02 -03:00 |
|
|
gnembon
|
609fc67061
|
Merge branch 'master' into 1.16
# Conflicts:
# src/main/java/carpet/script/utils/CarpetArgParser.java
|
2020-04-16 23:30:37 -03:00 |
|
|
gnembon
|
17b15b4893
|
refactor arg parsers
|
2020-04-16 23:30:05 -03:00 |
|
|
gnembon
|
531d1356a6
|
merge fixes
|
2020-04-16 21:11:12 -03:00 |
|
|
gnembon
|
a6477d3919
|
Merge branch 'master' into 1.16
# Conflicts:
# src/main/java/carpet/script/value/BlockValue.java
|
2020-04-16 21:02:16 -03:00 |
|
|
gnembon
|
fb1a03b3f7
|
refactor argument parsers
|
2020-04-16 17:47:06 -03:00 |
|
|
gnembon
|
bcbb197f13
|
Merge branch 'master' into 1.16
# Conflicts:
# docs/scarpet/Full.md
# docs/scarpet/api/BlocksAndWorldAccess.md
|
2020-04-16 00:55:09 -03:00 |
|
|
gnembon
|
022addf4e1
|
fixed #225 yet again, added display_name, command_name and team option for entities.
|
2020-04-16 00:24:02 -03:00 |
|
|
gnembon
|
9a588cf19a
|
fixes #225
|
2020-04-15 23:58:59 -03:00 |
|
|
gnembon
|
f47130a5fe
|
Revert "Fixed Ticket #225"
|
2020-04-15 23:51:02 -03:00 |
|
|
SnaveSutit
|
999106480c
|
Fixed Ticket #225
|
2020-04-15 22:39:07 -04:00 |
|
|
gnembon
|
7d1bced80d
|
gave proper names to bastion structures.
|
2020-04-15 22:22:57 -03:00 |
|
|
gnembon
|
8cd79d0add
|
b for bastion
|
2020-04-15 13:46:13 -03:00 |
|
|
gnembon
|
d6a903bd16
|
added variants to bastions
|
2020-04-15 13:45:17 -03:00 |
|
|
gnembon
|
989987688c
|
20w16a plop them anywhere.
|
2020-04-15 13:12:25 -03:00 |
|
|
gnembon
|
7ed0a28843
|
20w16a, added ruined portals and bastion remnants structures
|
2020-04-15 12:56:10 -03:00 |
|
|
gnembon
|
ca74935742
|
Merge branch 'master' into 1.16
|
2020-04-15 12:40:44 -03:00 |
|
|
gnembon
|
4bb283a851
|
1.3.19
|
2020-04-15 12:39:36 -03:00 |
|
|
gnembon
|
0da9e149cc
|
Merge branch 'master' into 1.16
|
2020-04-15 12:35:37 -03:00 |
|
|
gnembon
|
7ddf8658c8
|
refine tnt messaging
|
2020-04-15 11:51:46 -03:00 |
|
|
gnembon
|
ea1d1ab972
|
Merge branch 'master' into 1.16
|
2020-04-15 11:03:13 -03:00 |
|
|
gnembon
|
6932e5b682
|
added 'last_tick_times'
|
2020-04-15 11:01:26 -03:00 |
|
|
gnembon
|
64ffb27763
|
mappings
|
2020-04-15 02:12:57 -03:00 |
|
|
gnembon
|
a757c6f88a
|
Merge branch 'master' into 1.16
# Conflicts:
# src/main/java/carpet/script/bundled/Module.java
|
2020-04-15 02:00:31 -03:00 |
|
|
gnembon
|
8dbf269fde
|
added world_time and day_time. Add ability to store app data in shared space. as well as store in file hierarchies. Fixes #215
|
2020-04-15 01:58:46 -03:00 |
|
|
gnembon
|
3c25110b50
|
Merge pull request #213 from X-Green/master
More infomation in TNT logging
|
2020-04-14 09:31:55 -03:00 |
|
|
X-Green
|
4c5b19767e
|
Update TNTLogHelper.java
|
2020-04-14 16:19:38 +08:00 |
|
|
gnembon
|
3e76adbdaa
|
added deep frozen state where chunk tickets will not be expiring as well, preventing chunks from unloading. Fixes #204
|
2020-04-14 01:28:00 -03:00 |
|
|
gnembon
|
07b3029820
|
added mixer option and defaulted sounds to master. Fixes #201
|
2020-04-13 02:04:00 -03:00 |
|
|
gnembon
|
9b9750280c
|
fixes for 1.16
|
2020-04-13 01:18:39 -03:00 |
|
|
gnembon
|
7ebc96106b
|
Merge branch 'master' into 1.16
# Conflicts:
# src/main/java/carpet/mixins/ChunkTicketManager_scarpetMixin.java
# src/main/java/carpet/mixins/MinecraftServer_coreMixin.java
|
2020-04-13 01:08:06 -03:00 |
|
|
gnembon
|
2a1d5542f1
|
just to change from disabling spawn chunks to control over its size. Removes disableSpawnChunks, adds spawnChunksSize. Fixes #192
|
2020-04-13 00:59:55 -03:00 |
|
|
gnembon
|
19a01bee1b
|
cannot shadow other players if you are not OP. Fixes #208
|
2020-04-12 20:47:39 -03:00 |
|
|
gnembon
|
66e361167d
|
didn't treat appending to containers the same way for variables as well as for container lvalues. Fixes #209
|
2020-04-12 20:26:49 -03:00 |
|
|
gnembon
|
d6d6b69fcb
|
added inhabited_time and player events revolving around damage, death and respawns.
|
2020-04-12 19:42:04 -03:00 |
|
|
X-Green
|
ec0aecf6b5
|
More infomation in TNT logging #2
|
2020-04-12 10:56:06 +08:00 |
|
|
X-Green
|
dd4f2aa12d
|
More infomation in TNT logging #1
|
2020-04-12 10:55:22 +08:00 |
|
|
gnembon
|
9b50bf3a79
|
Merge branch 'master' into 1.16
|
2020-04-08 12:32:07 -03:00 |
|
|
gnembon
|
e1948a2fe0
|
1.3.18
|
2020-04-08 12:31:08 -03:00 |
|
|
gnembon
|
7369f39f06
|
Merge branch 'master' into 1.16
|
2020-04-08 01:29:08 -03:00 |
|
|
gnembon
|
cdf7445e20
|
counter results sorted by rate
|
2020-04-08 01:28:43 -03:00 |
|
|
gnembon
|
c1deda1b64
|
mappings
|
2020-04-08 01:16:47 -03:00 |
|
|
gnembon
|
a867c04b11
|
inhabited_time
|
2020-04-04 01:31:44 -03:00 |
|
|
gnembon
|
76080f1a59
|
20w14a
|
2020-04-02 23:38:19 -03:00 |
|
|
gnembon
|
a4626df004
|
Merge branch 'master' into 1.16
|
2020-04-01 13:22:16 -03:00 |
|
|
gnembon
|
321a051a80
|
1.3.17?
|
2020-04-01 13:19:37 -03:00 |
|
|
gnembon
|
c2dfaca1b8
|
added 'ping'
|
2020-04-01 13:09:02 -03:00 |
|
|
gnembon
|
652ca7d6a0
|
spawning illegal entities with perimetercheck, fixes #194
|
2020-03-31 21:04:09 -03:00 |
|
|
gnembon
|
182eac89c9
|
too long player names, fixes #195
|
2020-03-31 20:53:10 -03:00 |
|
|
gnembon
|
40ab2dda8d
|
mappings
|
2020-03-31 02:03:04 -03:00 |
|