 gnembon
|
657acc3c6e
|
towards 1.3.1
|
2019-12-12 09:02:46 -04:00 |
|
|
gnembon
|
9ebeba1d99
|
Merge branch 'master' into 1.15
|
2019-12-12 08:59:54 -04:00 |
|
|
gnembon
|
cf489a9ab7
|
fix undef variables
|
2019-12-12 08:58:59 -04:00 |
|
|
gnembon
|
25a51da4b8
|
relative position fail
|
2019-12-12 01:44:54 -04:00 |
|
|
gnembon
|
b80679080f
|
Merge branch 'master' into 1.15
|
2019-12-11 23:46:20 -04:00 |
|
|
gnembon
|
6abd3c33f2
|
scarpet is 1.6 rn
|
2019-12-11 23:28:19 -04:00 |
|
|
gnembon
|
2d8ecb1341
|
Merge branch 'master' into 1.15
|
2019-12-11 00:59:37 -04:00 |
|
|
gnembon
|
98289b92fd
|
carpet is not the only fabric mod in the world
|
2019-12-11 00:57:31 -04:00 |
|
|
gnembon
|
e32f915967
|
plopped the docs
|
2019-12-11 00:50:21 -04:00 |
|
|
gnembon
|
c0d9b6ecb6
|
Merge branch 'master' into 1.15
|
2019-12-11 00:31:58 -04:00 |
|
|
gnembon
|
f9b51ef141
|
extremeBehaviours
|
2019-12-11 00:30:46 -04:00 |
|
|
gnembon
|
d279696c18
|
1.15
|
2019-12-11 00:04:38 -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
|
8b1286f8af
|
fixed missed command registration for extension, 1.3.0, added optional version.
|
2019-12-10 23:01:30 -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
|
442b802638
|
Merge branch 'master' into 1.15
|
2019-12-09 10:36:40 -04:00 |
|
|
gnembon
|
5b2d45f152
|
1.2.6 aka 1.3 pre-1
|
2019-12-09 10:34:32 -04:00 |
|
|
gnembon
|
5005271ea3
|
Merge branch 'master' into 1.15
|
2019-12-08 13:14:55 -04:00 |
|
|
gnembon
|
1984c2cc77
|
fixed profiler counting be time in e time
|
2019-12-08 13:14:31 -04:00 |
|
|
gnembon
|
04459094e6
|
1.15 mixin cleanup
|
2019-12-07 01:07:19 -04:00 |
|
|
gnembon
|
380b9131d8
|
added bee tree
|
2019-12-07 01:06:08 -04:00 |
|
|
gnembon
|
56ea9ac961
|
cleaning up fixed 1.15 features
|
2019-12-06 16:49:50 -04:00 |
|
|
gnembon
|
511919ae1b
|
trying the beehive feature
|
2019-12-06 16:22:29 -04:00 |
|
|
gnembon
|
9df699746c
|
fixed plop 1.15 changes
|
2019-12-06 15:47:13 -04:00 |
|
|
gnembon
|
3907a949a3
|
Merge branch 'master' into 1.15
|
2019-12-06 13:41:39 -04:00 |
|
|
gnembon
|
9cca6ddfb5
|
just to make sure string booleans are handled properly
|
2019-12-06 13:41:13 -04:00 |
|
|
gnembon
|
645f5db2bf
|
block commands by default supports new extended boolean values
|
2019-12-06 12:47:52 -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
|
7802037ab0
|
fix explosions yet again
|
2019-12-03 17:30:37 -04:00 |
|
|
gnembon
|
f8fd213612
|
1.15 pre4
|
2019-12-03 16:57:01 -04:00 |
|
|
gnembon
|
8cb2455eab
|
Merge branch 'master' into 1.15
|
2019-12-03 16:41:03 -04:00 |
|
|
gnembon
|
355708609c
|
1.2.5+v191203
|
2019-12-03 16:36:02 -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
|
431080eea9
|
Merge branch 'master' into 1.15
|
2019-12-01 01:05:27 -04:00 |
|
|
gnembon
|
b52b5c335f
|
ops options for commands
|
2019-12-01 01:04:58 -04:00 |
|
|
gnembon
|
c2f22a141a
|
dispenser category
|
2019-11-30 19:45:07 -04:00 |
|
|
gnembon
|
af153eb42d
|
Merge branch 'master' into 1.15
|
2019-11-30 01:26:08 -04:00 |
|
|
gnembon
|
4736c6b4fd
|
1.2.5 prep
|
2019-11-30 01:25:02 -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
|
5beef273a1
|
Merge branch 'master' into 1.15
|
2019-11-28 20:02:41 -04:00 |
|