1.10 update #1282
Merged
1.10 update #1282
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- require confirmation to reset ordering - add dirt background and spacer to the side menu - do not render items as unavailable when moving an item - hide hand and hotbar in reordering screen - disable movement in reordering screen
make their decor jigsaw block now properly point to the right pool file (I did a rename a long time ago to go from repurposed_structures:village/ to repurposed_structures:villages/ ) Also changed swamp piece to use mangrove blocks
- check other block pos before placing - include med chair and tombstone 3 as split block
- increase dark stone spawn in the vampire forest
# Conflicts: # src/generated/resources/data/vampirism/vampirism/tasks/hunter_minion_equipment.json # src/generated/resources/data/vampirism/vampirism/tasks/vampire_minion_binding.json # src/main/java/de/teamlapen/vampirism/client/core/ModBlocksRender.java # src/main/java/de/teamlapen/vampirism/core/ModBlocks.java # src/main/java/de/teamlapen/vampirism/core/ModTiles.java # src/main/java/de/teamlapen/vampirism/data/BlockStateGenerator.java # src/main/java/de/teamlapen/vampirism/data/ItemModelGenerator.java # src/main/java/de/teamlapen/vampirism/data/LootTablesGenerator.java # src/main/java/de/teamlapen/vampirism/data/TagGenerator.java # src/main/java/de/teamlapen/vampirism/misc/VampirismCreativeTab.java # src/main/resources/assets/vampirism/lang/en_us.json
add ancient remains boss fight
- bypasses armor
- fix render type of potted cursed roots
add blood infused iron storage blocks as base
remove custom hunter equipment layer
# Conflicts: # .github/ISSUE_TEMPLATE/bug_report.yml # .github/ISSUE_TEMPLATE/mod_incompatibility.yml # .github/workflows/gradle.yml # .idea/compiler.xml # README.md # build.gradle # gradle.properties # gradle/deploy.gradle # gradle/forge.gradle # src/generated/resources/data/minecraft/tags/damage_type/bypasses_armor.json # src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_block_dark_brick_from_castle_block_dark_brick.json # src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_slaps_dark_brick_from_castle_block_dark_brick.json # src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_slaps_dark_brick_from_castle_block_dark_stone.json # src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_slaps_dark_stone_from_castle_block_dark_brick.json # src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_slaps_dark_stone_from_castle_block_dark_stone.json # src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_stairs_dark_brick_from_castle_block_dark_brick.json # src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_stairs_dark_brick_from_castle_block_dark_stone.json # src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_stairs_dark_stone_from_castle_block_dark_brick.json # src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_stairs_dark_stone_from_castle_block_dark_stone.json # src/generated/resources/data/vampirism/loot_tables/blocks/bat_cage.json # src/generated/resources/data/vampirism/loot_tables/blocks/castle_slab_dark_brick.json # src/generated/resources/data/vampirism/loot_tables/blocks/castle_slab_dark_stone.json # src/generated/resources/data/vampirism/loot_tables/blocks/castle_stairs_dark_brick.json # src/generated/resources/data/vampirism/loot_tables/blocks/castle_stairs_dark_stone.json # src/generated/resources/data/vampirism/loot_tables/blocks/cursed_earth_path.json # src/generated/resources/data/vampirism/loot_tables/blocks/fog_diffuser.json # src/generated/resources/data/vampirism/loot_tables/blocks/mother_trophy.json # src/generated/resources/data/vampirism/recipes/dark_stone_slab.json # src/generated/resources/data/vampirism/recipes/dark_stone_stairs.json # src/generated/resources/data/vampirism/recipes/dark_stone_tiles_slab.json # src/generated/resources/data/vampirism/recipes/dark_stone_tiles_stairs.json # src/lib/java/de/teamlapen/lib/lib/util/UtilLib.java # src/main/java/de/teamlapen/vampirism/VampirismMod.java # src/main/java/de/teamlapen/vampirism/blockentity/AltarInspirationBlockEntity.java # src/main/java/de/teamlapen/vampirism/blocks/CastleBricksBlock.java # src/main/java/de/teamlapen/vampirism/blocks/CursedBarkBlock.java # src/main/java/de/teamlapen/vampirism/blocks/CursedGrass.java # src/main/java/de/teamlapen/vampirism/blocks/CursedSpruceBlock.java # src/main/java/de/teamlapen/vampirism/blocks/DarkStoneSlabBlock.java # src/main/java/de/teamlapen/vampirism/blocks/DarkStoneStairsBlock.java # src/main/java/de/teamlapen/vampirism/blocks/GarlicDiffuserBlock.java # src/main/java/de/teamlapen/vampirism/blocks/HunterTableBlock.java # src/main/java/de/teamlapen/vampirism/client/core/ClientEventHandler.java # src/main/java/de/teamlapen/vampirism/client/core/ModKeys.java # src/main/java/de/teamlapen/vampirism/client/gui/overlay/ActionDurationOverlay.java # src/main/java/de/teamlapen/vampirism/client/gui/overlay/CustomBossEventOverlay.java # src/main/java/de/teamlapen/vampirism/client/gui/screens/AltarInfusionScreen.java # src/main/java/de/teamlapen/vampirism/client/gui/screens/HunterTableScreen.java # src/main/java/de/teamlapen/vampirism/client/gui/screens/HunterTrainerScreen.java # src/main/java/de/teamlapen/vampirism/client/gui/screens/VampirePlayerAppearanceScreen.java # src/main/java/de/teamlapen/vampirism/client/gui/screens/VampirismContainerScreen.java # src/main/java/de/teamlapen/vampirism/client/gui/screens/skills/SkillNodeScreen.java # src/main/java/de/teamlapen/vampirism/client/gui/screens/taskboard/TaskList.java # src/main/java/de/teamlapen/vampirism/client/model/HunterMinionModel.java # src/main/java/de/teamlapen/vampirism/client/renderer/entity/AdvancedHunterRenderer.java # src/main/java/de/teamlapen/vampirism/client/renderer/entity/BasicHunterRenderer.java # src/main/java/de/teamlapen/vampirism/client/renderer/entity/HunterMinionRenderer.java # src/main/java/de/teamlapen/vampirism/client/renderer/entity/HunterTaskMasterRenderer.java # src/main/java/de/teamlapen/vampirism/client/renderer/entity/HunterTrainerRenderer.java # src/main/java/de/teamlapen/vampirism/client/renderer/entity/layers/HunterEquipmentLayer.java # src/main/java/de/teamlapen/vampirism/command/VersionCheckCommand.java # src/main/java/de/teamlapen/vampirism/command/test/GarlicCheckCommand.java # src/main/java/de/teamlapen/vampirism/core/ModBlocks.java # src/main/java/de/teamlapen/vampirism/core/ModContainer.java # src/main/java/de/teamlapen/vampirism/core/ModDamageTypes.java # src/main/java/de/teamlapen/vampirism/core/ModEntities.java # src/main/java/de/teamlapen/vampirism/core/ModItems.java # src/main/java/de/teamlapen/vampirism/core/ModRegistries.java # src/main/java/de/teamlapen/vampirism/core/ModTags.java # src/main/java/de/teamlapen/vampirism/core/RegistryManager.java # src/main/java/de/teamlapen/vampirism/data/LootTablesGenerator.java # src/main/java/de/teamlapen/vampirism/data/TagGenerator.java # src/main/java/de/teamlapen/vampirism/data/reloadlistener/BloodValuesReloadListener.java # src/main/java/de/teamlapen/vampirism/effects/VampirismPoisonEffect.java # src/main/java/de/teamlapen/vampirism/entity/ConvertedCreature.java # src/main/java/de/teamlapen/vampirism/entity/DarkBloodProjectileEntity.java # src/main/java/de/teamlapen/vampirism/entity/ModEntityEventHandler.java # src/main/java/de/teamlapen/vampirism/entity/ai/goals/GolemTargetNonVillageFactionGoal.java # src/main/java/de/teamlapen/vampirism/entity/ai/goals/NearestTargetGoalModifier.java # src/main/java/de/teamlapen/vampirism/entity/converted/ConvertedCowEntity.java # src/main/java/de/teamlapen/vampirism/entity/converted/ConvertedCreatureEntity.java # src/main/java/de/teamlapen/vampirism/entity/converted/ConvertedDonkeyEntity.java # src/main/java/de/teamlapen/vampirism/entity/converted/ConvertedVillagerEntity.java # src/main/java/de/teamlapen/vampirism/entity/hunter/BasicHunterEntity.java # src/main/java/de/teamlapen/vampirism/entity/hunter/HunterTrainerEntity.java # src/main/java/de/teamlapen/vampirism/entity/player/TaskManager.java # src/main/java/de/teamlapen/vampirism/entity/player/hunter/HunterPlayer.java # src/main/java/de/teamlapen/vampirism/entity/player/tasks/req/ItemRequirement.java # src/main/java/de/teamlapen/vampirism/entity/player/tasks/reward/RefinementItemReward.java # src/main/java/de/teamlapen/vampirism/entity/player/vampire/BloodStats.java # src/main/java/de/teamlapen/vampirism/entity/player/vampire/VampirePlayer.java # src/main/java/de/teamlapen/vampirism/entity/player/vampire/actions/InfectAction.java # src/main/java/de/teamlapen/vampirism/inventory/HunterTableMenu.java # src/main/java/de/teamlapen/vampirism/inventory/HunterTrainerMenu.java # src/main/java/de/teamlapen/vampirism/inventory/TaskBoardMenu.java # src/main/java/de/teamlapen/vampirism/inventory/VampirismMenu.java # src/main/java/de/teamlapen/vampirism/items/ColoredVampireClothingItem.java # src/main/java/de/teamlapen/vampirism/items/HolyWaterSplashBottleItem.java # src/main/java/de/teamlapen/vampirism/items/HunterAxeItem.java # src/main/java/de/teamlapen/vampirism/items/HunterHatItem.java # src/main/java/de/teamlapen/vampirism/items/StakeItem.java # src/main/java/de/teamlapen/vampirism/items/VampirismVampireSwordItem.java # src/main/java/de/teamlapen/vampirism/mixin/NearestAttackableTargetGoalMixin.java # src/main/java/de/teamlapen/vampirism/modcompat/jei/TaskRecipeCategory.java # src/main/java/de/teamlapen/vampirism/util/Helper.java # src/main/java/de/teamlapen/vampirism/world/ModDamageSources.java # src/main/java/de/teamlapen/vampirism/world/VampirismWorld.java # src/main/java/de/teamlapen/vampirism/world/gen/VampirismFeatures.java # src/main/java/de/teamlapen/vampirism/world/gen/structure/huntercamp/HunterCampPieces.java # src/main/resources/META-INF/accesstransformer.cfg # src/main/resources/META-INF/mods.toml # src/main/resources/assets/vampirism/lang/en_us.json # src/main/resources/assets/vampirism/textures/gui/icons.png # src/main/resources/assets/vampirism/textures/gui/vampirism_menu_refinements.png # src/main/resources/pack.mcmeta # src/main/resources/supporters.json # src/main/resources/vampireBooks.json # src/main/resources/vampirism.mixins.json
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.