 gnembon
|
23baea19a1
|
tree plop eagerly fixes #246
|
2020-04-22 22:32:02 -03:00 |
|
|
gnembon
|
4270f8d718
|
Merge branch 'master' into 1.16
# Conflicts:
# gradle.properties
# src/main/java/carpet/CarpetSettings.java
# src/main/resources/fabric.mod.json
|
2020-04-22 17:11:10 -03:00 |
|
|
gnembon
|
1ab00ef957
|
1.3.20
|
2020-04-22 17:08:55 -03:00 |
|
|
gnembon
|
f2e9a9de91
|
20w17a
|
2020-04-22 17:00:31 -03:00 |
|
|
gnembon
|
d749bbe3ff
|
mappings
|
2020-04-22 02:10:28 -03:00 |
|
|
gnembon
|
1e04eafdc2
|
1.16 fixes
|
2020-04-22 01:49:36 -03:00 |
|
|
gnembon
|
c0d8f1e5a1
|
Merge branch 'master' into 1.16
|
2020-04-22 01:46:31 -03:00 |
|
|
gnembon
|
24787e8e56
|
renaming getTicketManager to de-conflict with other mods
|
2020-04-22 01:26:06 -03:00 |
|
|
gnembon
|
f5316a1e2d
|
fixes #228
|
2020-04-21 01:38:48 -03:00 |
|
|
gnembon
|
d56706b133
|
fixes #234
|
2020-04-21 03:03:28 -03:00 |
|
|
gnembon
|
a02d4d7e7c
|
Merge branch 'master' into 1.16
|
2020-04-16 22:34:20 -03:00 |
|
|
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
|
56749f731a
|
refactored scan to also take pos arguments.
|
2020-04-16 22:33:53 -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
|
574b5e0431
|
added bastion remnants to overlay
|
2020-04-16 09:52:53 -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
|
de4c72b8b6
|
Merge pull request #227 from gnembon/revert-226-1.16
Revert "Fixed Ticket #225"
|
2020-04-15 23:51:13 -03:00 |
|
|
gnembon
|
f47130a5fe
|
Revert "Fixed Ticket #225"
|
2020-04-15 23:51:02 -03:00 |
|
|
gnembon
|
37af1d4cd6
|
Merge pull request #226 from SnaveSutit/1.16
Fixed Ticket #225
|
2020-04-15 23:49:17 -03:00 |
|
|
SnaveSutit
|
999106480c
|
Fixed Ticket #225
|
2020-04-15 22:39:07 -04:00 |
|
|
gnembon
|
a229c2084c
|
added new structure info
|
2020-04-15 22:46:58 -03: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
|
9c75d55579
|
docs
|
2020-04-15 13:21:56 -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
|
3fe2d5174b
|
added 'last_tick_times'
|
2020-04-15 11:02:46 -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
|
e6df82f30f
|
mappings
|
2020-04-13 01:21:27 -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 |
|