 gnembon
|
81e0d733f7
|
merging structures to 1.15
|
2020-01-21 01:56:56 -04:00 |
|
|
gnembon
|
145bcf1b3c
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/fakes/StructureFeatureInterface.java
# src/main/java/carpet/helpers/FeatureGenerator.java
# src/main/java/carpet/mixins/StructureFeatureMixin.java
|
2020-01-21 01:43:53 -04:00 |
|
|
gnembon
|
50d30aafb2
|
structure_set and unification with scarpet naming conventions
|
2020-01-21 01:39:23 -04:00 |
|
|
gnembon
|
d11dcc980d
|
Merge branch 'master' into 1.15
|
2020-01-20 22:10:38 -04:00 |
|
|
gnembon
|
4da4f7124f
|
mapping fixes
|
2020-01-20 22:10:22 -04:00 |
|
|
gnembon
|
9c62968ee8
|
1.15.2 pre2 and mappings
|
2020-01-17 17:36:39 -04:00 |
|
|
gnembon
|
c4632b9d8b
|
POI API
|
2020-01-17 17:16:21 -04:00 |
|
|
gnembon
|
5addcc54c4
|
Merge branch 'master' into 1.15
|
2020-01-17 17:11:10 -04:00 |
|
|
gnembon
|
dd31d43192
|
POI API
|
2020-01-17 17:10:22 -04:00 |
|
|
gnembon
|
c054400301
|
hidden mapping changes
|
2020-01-14 19:41:10 -04:00 |
|
|
gnembon
|
1ea8815bd0
|
Merge branch 'master' into 1.15
|
2020-01-10 21:50:20 -04:00 |
|
|
gnembon
|
b4482214c9
|
customizable forceload limit
|
2020-01-10 21:48:09 -04:00 |
|
|
gnembon
|
671cad22bb
|
Merge branch 'master' into 1.15
|
2020-01-10 11:32:16 -04:00 |
|
|
gnembon
|
80b72366ee
|
attempt to fix #129
|
2020-01-10 01:21:14 -04:00 |
|
|
gnembon
|
c75ee6b385
|
update yarn
|
2020-01-09 00:23:20 -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
|
011240a87b
|
compatibility with other mods, not crucial for carpetmod
|
2020-01-03 01:41:33 -04:00 |
|
|
gnembon
|
e25d70cb51
|
compatibility with other mods, not crucial for carpetmod
|
2020-01-03 01:40:35 -04:00 |
|
|
gnembon
|
8bcb433f72
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/mixins/MinecraftServer_tickspeedMixin.java
# src/main/resources/carpet.mixins.json
|
2020-01-03 00:16:46 -04:00 |
|
|
gnembon
|
78ea9cd6e4
|
1.3.3
|
2020-01-03 00:13:05 -04:00 |
|
|
gnembon
|
c568a3d258
|
Merge pull request #125 from G4me4u/master
Added a way to ensure tickrate compatibility with other mods.
|
2020-01-02 19:45:32 -04:00 |
|
|
gnembon
|
f15ecd1dd2
|
better smooths WIP
|
2020-01-02 17:30:19 -04:00 |
|
|
G4me4u
|
490db4f5d6
|
Added a way to ensure tickrate compatibility with other mods
|
2020-01-02 21:49:13 +01:00 |
|
|
gnembon
|
eebc8d3e92
|
for 1.15
|
2020-01-02 10:41:55 -04:00 |
|
|
gnembon
|
06b90822b8
|
Merge branch 'master' into 1.15
|
2020-01-02 10:38:33 -04:00 |
|
|
gnembon
|
b6632d7ec8
|
fix vanilla bug removing sbox counts
|
2020-01-02 10:38:12 -04:00 |
|
|
gnembon
|
8022d88d28
|
WOOL
|
2019-12-28 18:00:28 -04:00 |
|
|
gnembon
|
762ddacdbd
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/mixins/PortalForcer_portalCachingMixin.java
# src/main/resources/carpet.mixins.json
|
2019-12-28 17:58:13 -04:00 |
|
|
gnembon
|
b2a72dbcd8
|
WOOL
|
2019-12-28 17:57:52 -04:00 |
|
|
gnembon
|
025855af42
|
1.15.1 build 17
|
2019-12-27 23:29:58 -04:00 |
|
|
gnembon
|
e9e36f64a3
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/mixins/ServerPlayNetworkHandler_scarpetEventsMixin.java
# src/main/java/carpet/script/CarpetExpression.java
# src/main/resources/carpet.mixins.json
|
2019-12-27 11:26:49 -04:00 |
|
|
gnembon
|
d7ca974f1a
|
statistics, block placed and interacted events, stats event test
|
2019-12-27 03:25:56 -04:00 |
|
|
gnembon
|
3e6f83905c
|
Merge branch 'master' into 1.15
# Conflicts:
# src/main/java/carpet/script/CarpetExpression.java
|
2019-12-25 03:18:15 -04:00 |
|
|
gnembon
|
a4e6e7cb10
|
camera update and task clearing
|
2019-12-25 02:44:14 -04:00 |
|
|
gnembon
|
ab3334e452
|
Merge branch 'threads' of https://github.com/gnembon/fabric-carpet into threads
|
2019-12-18 10:41:21 -04:00 |
|
|
gnembon
|
9457ce741c
|
fixed te fillUpdates and client call fix. better camera
|
2019-12-18 10:41:03 -04:00 |
|
|
gnembon
|
423701d4d7
|
Revert "threading testing"
This reverts commit 9ba573af
|
2019-12-17 11:58:35 -04:00 |
|
|
gnembon
|
9ba573afe6
|
threading testing
|
2019-12-17 10:28:14 -04:00 |
|
|
gnembon
|
7bfc2d394c
|
Merge branch 'master' into 1.15
|
2019-12-13 01:28:14 -04:00 |
|
|
gnembon
|
04cd9ce93e
|
should that fix mapping issues?
|
2019-12-13 01:25:08 -04:00 |
|
|
gnembon
|
ada89c1f7e
|
fixed 1.15 positioning
|
2019-12-13 02:50:11 -04:00 |
|
|
gnembon
|
cf53ee72e0
|
Merge branch 'master' into 1.15
|
2019-12-12 17:22:56 -04:00 |
|
|
gnembon
|
05ac5dee2c
|
extremeBenchmark
|
2019-12-12 17:22:06 -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
|
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 |
|