 gnembon
|
2d8ecb1341
|
Merge branch 'master' into 1.15
|
2019-12-11 00:59:37 -04:00 |
|
|
gnembon
|
e32f915967
|
plopped the docs
|
2019-12-11 00:50:21 -04:00 |
|
|
gnembon
|
8f9dd66cdf
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/mixins/BuriedTreasureGeneratorPieceMixin.java
# src/main/java/carpet/mixins/ClientPlayerInteractionManager_ghostBlocksMixin.java
# src/main/java/carpet/mixins/FossilFeatureMixin.java
# src/main/java/carpet/mixins/GravityStructureProcessorMixin.java
# src/main/java/carpet/mixins/IglooGeneratorPieceMixin.java
# src/main/java/carpet/mixins/KelpFeatureMixin.java
# src/main/java/carpet/mixins/MobEntity_leashMixin.java
# src/main/java/carpet/mixins/OceanRuinGeneratorPieceMixin.java
# src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java
# src/main/java/carpet/mixins/PlayerEntity_horseFixMixin.java
# src/main/java/carpet/mixins/PortalBlock_portalCachingMixin.java
# src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java
# src/main/java/carpet/mixins/SaplingBlockMixin.java
# src/main/java/carpet/mixins/ServerPlayerInteractionManager_ghostBlocksMixin.java
# src/main/java/carpet/mixins/ShipwreckGeneratorPieceMixin.java
# src/main/java/carpet/mixins/SpawnHelperMixin.java
# src/main/java/carpet/mixins/StructurePieceMixin.java
|
2019-12-10 23:14:04 -04:00 |
|
|
gnembon
|
55065a38a6
|
moved CarpetSettings up from settings manager, should be easier to find later.
|
2019-12-10 23:08:40 -04:00 |
|
|
gnembon
|
cc9cc17b27
|
Merge branch 'master' into 1.15
|
2019-12-10 00:13:20 -04:00 |
|
|
gnembon
|
3dfd44538b
|
4 2
|
2019-12-10 00:11:12 -04:00 |
|
|
gnembon
|
20f8c0a965
|
Merge branch 'master' into 1.15
|
2019-12-06 12:24:34 -04:00 |
|
|
gnembon
|
656638c6dc
|
continue and break scarpet functions to replace _exit_ conditions in loops
|
2019-12-06 12:24:13 -04:00 |
|
|
gnembon
|
7f49ee09ad
|
continue and break scarpet functions to replace _exit_ conditions in loops
|
2019-12-06 12:22:27 -04:00 |
|
|
gnembon
|
d764543f51
|
1.15-pre5-2
|
2019-12-05 21:45:14 -04:00 |
|
|
gnembon
|
75dea94df2
|
removed client function call
|
2019-12-03 23:15:26 -04:00 |
|
|
gnembon
|
942b41ecc4
|
Merge branch 'master' into 1.15
|
2019-12-03 23:13:30 -04:00 |
|
|
gnembon
|
20d066c674
|
removed client function call
|
2019-12-03 23:13:10 -04:00 |
|
|
gnembon
|
c9160144fc
|
Merge branch 'master' into 1.15
|
2019-12-01 09:39:25 -04:00 |
|
|
gnembon
|
9d6b652ad4
|
better block error message
|
2019-12-01 03:14:20 -04:00 |
|
|
gnembon
|
bd5bd12e2a
|
Merge branch 'master' into 1.15
|
2019-11-29 10:34:36 -04:00 |
|
|
gnembon
|
afd7952a62
|
refactor entity events. Allow multiple hosts have events on things
|
2019-11-29 10:34:13 -04:00 |
|
|
gnembon
|
6497200dac
|
1.15 pre2 - 4
|
2019-11-28 11:43:55 -04:00 |
|
|
gnembon
|
e4520a0a11
|
1.15 change
|
2019-11-26 02:15:42 -04:00 |
|
|
gnembon
|
fc9dcb6111
|
1.15 change
|
2019-11-26 02:10:01 -04:00 |
|
|
gnembon
|
6e97401ebb
|
Merge branch 'master' into 1.15
|
2019-11-26 02:07:25 -04:00 |
|
|
gnembon
|
8b73d57a6b
|
chunk_tickets_api
|
2019-11-26 02:05:48 -04:00 |
|
|
gnembon
|
a463b10bca
|
1.15 pre1 - 7
|
2019-11-25 15:17:44 -04:00 |
|
|
gnembon
|
aa8f5c1921
|
Merge branch 'master' into 1.15
|
2019-11-22 00:24:08 -04:00 |
|
|
gnembon
|
6413c17657
|
cleanup undef
|
2019-11-22 00:23:50 -04:00 |
|
|
gnembon
|
24c1ee8d3d
|
lists and maps copy by reference. use copy to get a copy.
|
2019-11-21 21:21:58 -04:00 |
|
|
gnembon
|
f5ffdb6eb9
|
Merge branch 'master' into 1.15
|
2019-11-20 23:37:36 -04:00 |
|
|
gnembon
|
dd2630579b
|
built-in variables can be used in outer scopes.
|
2019-11-20 23:37:16 -04:00 |
|
|
gnembon
|
f6eea46195
|
new loader
|
2019-11-20 01:16:46 -04:00 |
|
|
gnembon
|
df9280e8c2
|
Merge branch 'master' into 1.15
|
2019-11-19 22:56:30 -04:00 |
|
|
gnembon
|
a9238b9918
|
docs
|
2019-11-19 22:53:26 -04:00 |
|
|
gnembon
|
909b183bda
|
Merge branch 'master' into 1.15
|
2019-11-19 01:32:15 -04:00 |
|
|
gnembon
|
9e529fe967
|
Separate ScriptHost from CarpetScriptHost
|
2019-11-19 01:31:56 -04:00 |
|
|
gnembon
|
729399870e
|
Merge branch 'master' into 1.15
|
2019-11-18 22:07:42 -04:00 |
|
|
gnembon
|
bd61340e46
|
events are added on the fly as source loads
|
2019-11-18 16:06:35 -04:00 |
|
|
gnembon
|
12408cac75
|
Merge branch 'master' into 1.15
|
2019-11-18 01:17:37 -04:00 |
|
|
gnembon
|
95b85928f9
|
refactored and reworked functions in scarpet
|
2019-11-18 00:56:50 -04:00 |
|
|
gnembon
|
831fc06e0a
|
Merge branch 'master' into 1.15
|
2019-11-12 00:58:30 -04:00 |
|
|
gnembon
|
33812fc88a
|
despawn timer for living entities
|
2019-11-12 00:57:58 -04:00 |
|
|
gnembon
|
d212fcb03d
|
Merge branch 'master' into 1.15
|
2019-11-09 23:19:00 -04:00 |
|
|
gnembon
|
bcff4fbbc4
|
clarify laziness of blocks and added more care to context execution
|
2019-11-09 23:12:05 -04:00 |
|
|
gnembon
|
829e0a7df5
|
Merge branch 'master' into 1.15
|
2019-11-08 22:47:29 -04:00 |
|
|
gnembon
|
6aa358c5fc
|
calling block for a block future will resolve it.
|
2019-11-08 22:47:18 -04:00 |
|
|
gnembon
|
4cc0412fe2
|
Merge branch 'master' into 1.15
|
2019-11-08 04:07:28 -04:00 |
|
|
gnembon
|
f30459bd22
|
fixed docs
|
2019-11-08 04:03:39 -04:00 |
|
|
gnembon
|
ec19e37a74
|
19w45a
|
2019-11-07 16:13:15 -04:00 |
|
|
gnembon
|
4f0389fa7e
|
115
|
2019-11-07 07:59:28 -04:00 |
|
|
gnembon
|
718fb38d7d
|
Merge branch 'master' into 1.15
|
2019-11-07 07:59:05 -04:00 |
|
|
gnembon
|
4997fa5a44
|
added optional force bool
|
2019-11-07 07:58:17 -04:00 |
|
|
gnembon
|
947e53d770
|
Merge branch 'master' into 1.15
|
2019-11-07 01:11:51 -04:00 |
|