 gnembon
|
e04a8be9e8
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/script/CarpetExpression.java
|
2020-02-03 10:58:17 -04:00 |
|
|
gnembon
|
b4a50b8c3f
|
mulitple counters in hud - not really needed but why not.
|
2020-02-02 00:03:38 -04:00 |
|
|
gnembon
|
c995716357
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/fakes/StructureFeatureInterface.java
# src/main/java/carpet/mixins/PistonBlock_movableTEMixin.java
|
2020-01-06 21:28:07 -04:00 |
|
|
gnembon
|
6ac249968a
|
remove a few warnings
|
2020-01-06 21:26:44 -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
|
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
|
56ea9ac961
|
cleaning up fixed 1.15 features
|
2019-12-06 16:49:50 -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
|
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
|
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
|
5beef273a1
|
Merge branch 'master' into 1.15
|
2019-11-28 20:02:41 -04:00 |
|
|
gnembon
|
1c35f5b6a9
|
generalize set response, fixes #107
|
2019-11-28 20:01:28 -04:00 |
|
|
gnembon
|
b88e0be365
|
Merge branch 'master' into 1.15
|
2019-11-27 22:08:01 -04:00 |
|
|
gnembon
|
f3620ddafe
|
settings search returns ordered results
|
2019-11-27 21:24:05 -04:00 |
|
|
gnembon
|
80fcdd3cbe
|
settings search returns ordered results
|
2019-11-27 21:23:12 -04:00 |
|
|
gnembon
|
a463b10bca
|
1.15 pre1 - 7
|
2019-11-25 15:17:44 -04:00 |
|
|
gnembon
|
193b7a3e3a
|
Merge branch 'master' into 1.15
|
2019-11-21 00:13:44 -04:00 |
|
|
gnembon
|
848f95cd30
|
new snapshot ETA
|
2019-11-21 00:13:20 -04:00 |
|
|
gnembon
|
dbf48ea3bf
|
Merge branch 'master' into 1.15
|
2019-11-20 01:23:59 -04:00 |
|
|
gnembon
|
18edddcade
|
1.2.4
|
2019-11-20 01:18:32 -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
|
57d1546fb3
|
Merge branch 'master' into 1.15
|
2019-11-14 23:21:45 -04:00 |
|
|
gnembon
|
3feb7bffbb
|
midversion to support fixed profiler
|
2019-11-14 23:19:21 -04:00 |
|
|
gnembon
|
29fa86ca8a
|
Merge branch 'master' into 1.15
# Conflicts:
# gradle.properties
|
2019-11-13 14:03:52 -04:00 |
|
|
gnembon
|
12e6ef627f
|
1.2.3
|
2019-11-13 14:01:29 -04:00 |
|
|
gnembon
|
4cc0412fe2
|
Merge branch 'master' into 1.15
|
2019-11-08 04:07:28 -04:00 |
|
|
gnembon
|
223c5059be
|
v191108
|
2019-11-08 02:50:03 -04:00 |
|
|
gnembon
|
336b1070a3
|
disable kelpGenerationGrowthlimit because its fixes the same way in core
|
2019-11-08 02:46:51 -04:00 |
|
|
gnembon
|
6dd31329b7
|
Merge branch 'master' into 1.15
|
2019-11-07 14:29:26 -04:00 |
|
|
gnembon
|
c855955179
|
1.2.2
|
2019-11-07 14:27:25 -04:00 |
|
|
gnembon
|
99f6b4580d
|
Merge branch 'master' into 1.15
|
2019-10-30 13:24:03 -03:00 |
|
|
gnembon
|
e2c614c6de
|
ver 1.2.1
|
2019-10-30 13:18:41 -03:00 |
|
|
gnembon
|
6733aea207
|
Merge branch 'master' into 1.15
|
2019-10-24 00:59:12 -03:00 |
|
|
gnembon
|
fdc0d74ad9
|
inch forward dev deploy
|
2019-10-24 00:57:52 -03:00 |
|
|
gnembon
|
57c21364c6
|
Merge branch 'master' into 1.15
|
2019-10-23 09:09:44 -03:00 |
|
|
gnembon
|
f0bb5d2e86
|
fixed settings
|
2019-10-23 09:08:30 -03:00 |
|
|
gnembon
|
f41ae0f00e
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/mixins/TntEntityMixin.java
# src/main/java/carpet/script/value/EntityValue.java
|
2019-10-23 08:58:57 -03:00 |
|
|
Joe
|
7527b5c2b8
|
Split TNTRandomRangeValidator into two validators
|
2019-10-23 09:57:22 +01:00 |
|
|
Joe
|
df2ea4d2cc
|
Add TNT rules
|
2019-10-23 04:53:34 +01:00 |
|