 gnembon
|
b96a1b1216
|
Merge branch 'master' into 1.17
|
2021-05-25 17:25:55 -03:00 |
|
|
gnembon
|
f18cc1c836
|
more thread safe carpet globs
|
2021-05-25 17:24:14 -03:00 |
|
|
gnembon
|
71a8dcc31e
|
Merge branch 'master' into 1.17
|
2021-01-26 05:42:20 -04:00 |
|
|
gnembon
|
40b537501f
|
reverting that merge of mixins since it will cause havoc on the future version branches
|
2021-01-26 05:32:59 -04:00 |
|
|
|
e32b37dcf1
|
Add three Structure Block related settings (#664)
* Added structureBlockOutlineDistance
* Added structureBlockIgnored
* Added structureBlockLimit
* Made structureBlockLimit work on dedicated server
* Correct packet contents check and fix mixin list
* Add limits to structure block settings, slight optimisation to ignored block
* Fixed the `structureBlockLimit` limit
* Update src/main/java/carpet/CarpetSettings.java
Co-authored-by: altrisi <altrisi.trillosierra@gmail.com>
* Fix missing imports and a typo
* Update src/main/java/carpet/CarpetSettings.java
Co-authored-by: gnembon <41132274+gnembon@users.noreply.github.com>
Co-authored-by: altrisi <altrisi.trillosierra@gmail.com>
|
2021-01-22 23:38:10 -04:00 |
|
|
gnembon
|
5422493c33
|
20w49a
|
2020-12-02 19:22:56 -04:00 |
|
|
gnembon
|
28857815e0
|
mappings
|
2020-07-29 17:23:53 -03:00 |
|
|
gnembon
|
03061ba114
|
20w27a
|
2020-07-01 15:41:25 -03:00 |
|
|
gnembon
|
3b588e8488
|
20w22a
|
2020-05-29 12:15:51 -03:00 |
|
|
gnembon
|
77d819487e
|
20w20b
|
2020-05-14 12:51:46 -03: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
|
addb836b21
|
19w36a
|
2019-09-05 09:09:46 -03:00 |
|
|
gnembon
|
179bc21223
|
115 changes
|
2019-08-23 06:58:32 +02:00 |
|
|
gnembon
|
734dc95dab
|
settings ported to the annotation based system
|
2019-06-11 23:01:09 -03:00 |
|
|
gnembon
|
d35b6bde36
|
fill stuff
|
2019-05-18 14:24:51 -03:00 |
|