mirror of
https://github.com/PolyhedralDev/Terra.git
synced 2025-07-22 12:32:33 +00:00
193c09f60b
# Conflicts: # README.md # platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeAdapter.java # platforms/forge/src/main/java/com/dfsek/terra/forge/ForgeUtil.java # platforms/forge/src/main/java/com/dfsek/terra/forge/TerraForgePlugin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/block/ForgeBlock.java # platforms/forge/src/main/java/com/dfsek/terra/forge/block/ForgeBlockData.java # platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeAnaloguePowerable.java # platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeDirectional.java # platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeEnumAdapter.java # platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeMultipleFacing.java # platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeOrientable.java # platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeRotatable.java # platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeSlab.java # platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeStairs.java # platforms/forge/src/main/java/com/dfsek/terra/forge/block/data/ForgeWaterlogged.java # platforms/forge/src/main/java/com/dfsek/terra/forge/config/PostLoadCompatibilityOptions.java # platforms/forge/src/main/java/com/dfsek/terra/forge/config/PreLoadCompatibilityOptions.java # platforms/forge/src/main/java/com/dfsek/terra/forge/generation/ForgeChunkGeneratorWrapper.java # platforms/forge/src/main/java/com/dfsek/terra/forge/generation/PopulatorFeature.java # platforms/forge/src/main/java/com/dfsek/terra/forge/generation/TerraBiomeSource.java # platforms/forge/src/main/java/com/dfsek/terra/forge/generation/TerraGeneratorType.java # platforms/forge/src/main/java/com/dfsek/terra/forge/handle/ForgeItemHandle.java # platforms/forge/src/main/java/com/dfsek/terra/forge/handle/ForgeWorldHandle.java # platforms/forge/src/main/java/com/dfsek/terra/forge/listener/ForgeListener.java # platforms/forge/src/main/java/com/dfsek/terra/forge/listener/RegistryListener.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/DimensionGeneratorSettingsMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/ServerWorldMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/access/AbstractSpawnerAccessor.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/access/BiomeGeneratorTypeScreensAccessor.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/BiomeMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/ChunkGeneratorMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/ConfiguredFeatureMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/BlockMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/TileEntityMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/LockableLootTileEntityMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/MobSpawnerTileEntityMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/block/state/SignTileEntityMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/ChunkMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/WorldGenRegionMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/chunk/data/ChunkPrimerMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/entity/CommandSourceMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/entity/EntityMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/entity/EntityTypeMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/entity/PlayerEntityMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/LockableTileEntityMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/item/ItemMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/item/ItemStackMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/meta/EnchantmentMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/meta/ItemStackDamageableMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/inventory/meta/ItemStackMetaMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/package-info.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/world/ServerWorldMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/implementations/world/WorldGenRegionMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/init/MinecraftClientMixin.java # platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/init/MinecraftServerMixin.java # platforms/forge/src/main/resources/terra.mixins.json