gnembon
|
42a43ff245
|
Merge branch 'master' into 1.16
|
2020-07-22 17:15:29 -03:00 |
|
gnembon
|
3f593943c9
|
1.4.4
|
2020-07-22 16:58:09 -03:00 |
|
gnembon
|
359b89b46f
|
Merge branch 'master' into 1.16
|
2020-07-21 05:07:22 -03:00 |
|
gnembon
|
786e282889
|
player swaps hands event
|
2020-07-21 02:27:26 -03:00 |
|
Forgot-Dream
|
9d619f4797
|
update zh_cn.json and zh_tw.json (#385)
Translated by:Forgot-Dream and X-Green
Time:2020-7-18
|
2020-07-20 21:30:33 -03:00 |
|
gnembon
|
8833d33286
|
adjusting to 1.16
|
2020-07-19 02:57:14 -03:00 |
|
gnembon
|
8a07c96d45
|
Merge branch 'master' into 1.16
|
2020-07-15 16:40:35 -03:00 |
|
gnembon
|
c728fcb8cc
|
1.4.3
|
2020-07-15 15:36:09 -03:00 |
|
gnembon
|
6fad107c6b
|
restored timer on the villager
|
2020-07-15 15:15:16 -03:00 |
|
gnembon
|
f500da08a0
|
Merge branch 'master' into 1.16
# Conflicts:
# src/main/java/carpet/mixins/ServerPlayerInteractionManager_scarpetEventsMixin.java
|
2020-07-15 01:21:02 -03:00 |
|
gnembon
|
f871a5d473
|
move damage events before damage effects are applied
|
2020-07-14 23:36:11 -03:00 |
|
gnembon
|
0e21942df7
|
Merge branch 'master' into 1.16
|
2020-07-13 00:41:34 -03:00 |
|
gnembon
|
e2f48d6d16
|
1.4.2
|
2020-07-13 00:40:33 -03:00 |
|
gnembon
|
a0e0dc0f88
|
20w28a. Rewritten scarpet structure and plop API. Removed portalSuffocationFix, as its fixed.
|
2020-07-12 02:38:12 -03:00 |
|
eatmyvenom
|
753d262f6e
|
Add the rule bruteSpawningInBationRemnants
|
2020-07-02 22:35:26 -07:00 |
|
gnembon
|
150c1d41a7
|
renewableBlackstone
|
2020-07-01 15:07:17 -03:00 |
|
gnembon
|
c69f65e68e
|
Merge branch 'master' into 1.16
# Conflicts:
# src/main/java/carpet/script/CarpetExpression.java
|
2020-07-01 14:54:04 -03:00 |
|
gnembon
|
41258e8494
|
1.4.1
|
2020-07-01 14:51:00 -03:00 |
|
gnembon
|
af35504016
|
Merge branch 'master' into 1.16
# Conflicts:
# src/main/java/carpet/mixins/ThreadedAnvilChunkStorage_scarpetChunkCreationMixin.java
# src/main/java/carpet/script/CarpetExpression.java
|
2020-07-01 01:54:39 -03:00 |
|
gnembon
|
7067e59a21
|
Merge branch 'master' into light
# Conflicts:
# src/main/resources/carpet.accesswidener
# src/main/resources/fabric.mod.json
|
2020-07-01 00:11:35 -03:00 |
|
PhiPro95
|
0c1dba0157
|
Rewrite regenerateChunkRegion
|
2020-06-29 01:03:26 +02:00 |
|
gnembon
|
66a02c06cd
|
Merge branch 'master' into 1.16
|
2020-06-28 14:34:35 -03:00 |
|
gnembon
|
d3f1f77500
|
licence is MIT
|
2020-06-28 13:20:42 -03:00 |
|
gnembon
|
b8cf551df9
|
Merge branch 'master' into 1.16
|
2020-06-23 18:29:01 -03:00 |
|
gnembon
|
65cee37363
|
hmm
|
2020-06-23 18:23:57 -03:00 |
|
gnembon
|
a9c6e46c59
|
Merge branch 'master' into 1.16
|
2020-06-23 11:27:00 -03:00 |
|
gnembon
|
89bd9a0a55
|
1.4.0
|
2020-06-23 09:40:09 -03:00 |
|
gnembon
|
cad8c0bbd1
|
structure lag, booyah
|
2020-06-23 01:15:12 -03:00 |
|
gnembon
|
f50fa8cde2
|
Merge branch 'master' into 1.16
# Conflicts:
# src/main/java/carpet/script/CarpetExpression.java
|
2020-06-23 00:35:44 -03:00 |
|
Fallen_Breath
|
680acfdc8f
|
zh_cn.json update (#343)
* qc激活->半连接激活
* Update zh_cn.json
* ui.rule_%(rule)s_not_set_restart
* added quotation marks to rule translation display
|
2020-06-22 09:11:03 -03:00 |
|
gnembon
|
f23312c0fc
|
Merge branch 'master' into 1.16
# Conflicts:
# gradle.properties
|
2020-06-21 23:19:49 -03:00 |
|
gnembon
|
8b395e43b9
|
carpet 1.4 rc-1
|
2020-06-21 23:12:35 -03:00 |
|
gnembon
|
23d135a96c
|
moving away from main classse - fixes #341
|
2020-06-21 22:38:47 -03:00 |
|
gnembon
|
59a0f9e32d
|
Merge branch 'master' into 1.16
|
2020-06-21 17:26:30 -03:00 |
|
gnembon
|
04c91e7311
|
confirmation when rule removed from conf
|
2020-06-21 17:26:12 -03:00 |
|
gnembon
|
f09744b04e
|
Revert "removing stupid warning"
This reverts commit aea09c97
|
2020-06-20 23:42:42 -03:00 |
|
gnembon
|
aea09c9718
|
removing stupid warning
|
2020-06-20 23:30:15 -03:00 |
|
gnembon
|
df42370a00
|
Merge branch 'master' into 1.16
|
2020-06-18 02:05:10 -03:00 |
|
gnembon
|
9b59b000a4
|
raised a little
|
2020-06-18 02:03:58 -03:00 |
|
gnembon
|
f5a7455c19
|
Merge branch 'master' into 1.16
|
2020-06-18 01:57:42 -03:00 |
|
gnembon
|
cc8008a367
|
enables more transparency layers and toned down large boxes of overlays
|
2020-06-18 01:57:24 -03:00 |
|
gnembon
|
8f72c3ef8c
|
Merge branch 'master' into 1.16
|
2020-06-17 17:00:04 -03:00 |
|
gnembon
|
aeb67d1186
|
1.3.32
|
2020-06-17 16:57:32 -03:00 |
|
gnembon
|
63a10eb743
|
Merge branch 'master' into 1.16
|
2020-06-16 17:23:56 -03:00 |
|
gnembon
|
3273470871
|
1.3.31
|
2020-06-16 17:20:39 -03:00 |
|
gnembon
|
78973e54ec
|
Merge branch 'master' into 1.16
|
2020-06-15 18:59:24 -03:00 |
|
gnembon
|
fe69aa65c4
|
1.3.30
|
2020-06-15 18:35:10 -03:00 |
|
gnembon
|
80ca80fe24
|
Merge branch 'master' into 1.16
# Conflicts:
# src/main/java/carpet/network/ServerNetworkHandler.java
# src/main/java/carpet/script/CarpetExpression.java
|
2020-06-14 01:25:58 -03:00 |
|
gnembon
|
d098087e05
|
added recipe_data() and crafting_remaining_item() - for convenient crafting scripts.
|
2020-06-14 01:17:36 -03:00 |
|
gnembon
|
690c85f3b0
|
added __on_player_chooses_recipe and __on_player_switches_slot events
|
2020-06-14 01:15:10 -03:00 |
|