Merge from 1.20.2 into 1.20.1#600
Open
Acuadragon100 wants to merge 104 commits into
Open
Conversation
Closes WhoCraft#417
Co-Authored-By: Edrax Doodles <26338666+EdusgprNetwork@users.noreply.github.com>
Co-Authored-By: Edrax Doodles <26338666+EdusgprNetwork@users.noreply.github.com>
Co-Authored-By: Edrax Doodles <26338666+EdusgprNetwork@users.noreply.github.com>
Co-Authored-By: Edrax Doodles <26338666+EdusgprNetwork@users.noreply.github.com>
Update version to v2.1.2
- Bug Fix: [FORGE] Shell Patterns not shown on computer bank [WhoCraft#425](WhoCraft#425) - Bug Fix: Consoles not animating correctly - Bug fix: Tardis can travel to it's own dimension WhoCraft#435 - Bug fix: Tardis Shell Viewer not in correct position WhoCraft#434 WhoCraft#434
Co-authored-by: Craig (Jeryn) <sandedshoes@gmail.com>
# Conflicts: # build.gradle # changelog.md # common/src/main/java/dev/jeryn/anim/tardis/JsonToAnimationDefinition.java # common/src/main/java/whocraft/tardis_refined/TRConfig.java # common/src/main/java/whocraft/tardis_refined/client/ModelRegistry.java # common/src/main/java/whocraft/tardis_refined/client/model/blockentity/console/FactoryConsoleModel.java # common/src/main/java/whocraft/tardis_refined/client/model/blockentity/console/VictorianConsoleModel.java # common/src/main/java/whocraft/tardis_refined/client/model/blockentity/shell/ShellModelCollection.java # common/src/main/java/whocraft/tardis_refined/client/renderer/vortex/RenderTargetHelper.java # common/src/main/java/whocraft/tardis_refined/client/screen/main/MonitorOS.java # common/src/main/java/whocraft/tardis_refined/client/screen/screens/ShellSelectionScreen.java # common/src/main/java/whocraft/tardis_refined/client/screen/screens/VortexSelectionScreen.java # common/src/main/java/whocraft/tardis_refined/client/screen/upgrades/UpgradeWidget.java # common/src/main/java/whocraft/tardis_refined/common/block/shell/ShellBaseBlock.java # common/src/main/java/whocraft/tardis_refined/common/blockentity/door/GlobalDoorBlockEntity.java # common/src/main/java/whocraft/tardis_refined/common/blockentity/shell/ShellBaseBlockEntity.java # common/src/main/java/whocraft/tardis_refined/common/capability/player/TardisPlayerInfo.java # common/src/main/java/whocraft/tardis_refined/common/capability/tardis/TardisLevelOperator.java # common/src/main/java/whocraft/tardis_refined/common/crafting/astral_manipulator/ManipulatorCraftingIngredient.java # common/src/main/java/whocraft/tardis_refined/common/crafting/astral_manipulator/ManipulatorCraftingRecipeSerializer.java # common/src/main/java/whocraft/tardis_refined/common/tardis/TardisNavLocation.java # common/src/main/java/whocraft/tardis_refined/common/tardis/control/flight/DimensionalControl.java # common/src/main/java/whocraft/tardis_refined/common/tardis/manager/TardisPilotingManager.java # common/src/main/java/whocraft/tardis_refined/common/tardis/themes/ShellTheme.java # common/src/main/java/whocraft/tardis_refined/compat/portals/ImmersivePortals.java # common/src/main/java/whocraft/tardis_refined/compat/portals/ImmersivePortalsClient.java # common/src/main/java/whocraft/tardis_refined/constants/ModMessages.java # common/src/main/java/whocraft/tardis_refined/constants/NbtConstants.java # common/src/main/java/whocraft/tardis_refined/mixin/ServerPlayerMixin.java # common/src/main/java/whocraft/tardis_refined/patterns/ShellPatterns.java # common/src/main/java/whocraft/tardis_refined/registry/TRBlockEntityRegistry.java # common/src/main/resources/assets/tardis_refined/shaders/core/nivis_fragment.fsh # common/src/main/resources/assets/tardis_refined/tardis_refined/model_layers/door/half_baked_door.json # common/src/main/resources/assets/tardis_refined/tardis_refined/model_layers/door/pagoda_door.json # common/src/main/resources/assets/tardis_refined/tardis_refined/model_layers/door/pathfinder_door.json # common/src/main/resources/assets/tardis_refined/tardis_refined/model_layers/door/shulker_door.json # common/src/main/resources/assets/tardis_refined/tardis_refined/model_layers/door/vending_door.json # common/src/main/resources/assets/tardis_refined/tardis_refined/model_layers/shell/pathfinder_shell.json # common/src/main/resources/assets/tardis_refined/tardis_refined/model_layers/shell/shulker_shell.json # common/src/main/resources/assets/tardis_refined/tardis_refined/model_layers/technology/artron_pillar.json # common/src/main/resources/assets/tardis_refined/textures/blockentity/shell/pagoda/pagoda_interior.png # common/src/main/resources/assets/tardis_refined/textures/blockentity/shell/vending/vending_interior.png # common/src/main/resources/tardis_refined.accesswidener # fabric/build.gradle # fabric/src/main/java/whocraft/tardis_refined/fabric/events/ModEvents.java # forge/build.gradle # forge/src/main/java/whocraft/tardis_refined/common/data/ItemTagProvider.java # forge/src/main/java/whocraft/tardis_refined/common/data/LangProviderEnglish.java # forge/src/main/java/whocraft/tardis_refined/common/data/ProviderBlockTags.java # forge/src/main/java/whocraft/tardis_refined/common/util/forge/PlatformImpl.java # forge/src/main/java/whocraft/tardis_refined/forge/ClientForgeBus.java # forge/src/main/java/whocraft/tardis_refined/forge/ClientModBus.java # forge/src/main/java/whocraft/tardis_refined/overlays/TardisRefinedOverlay.java # forge/src/main/resources/tardis_refined.mixins.json # gradle.properties
…before after starting the game.
…ith the base block.
…r side. This makes sure the sound plays when interacting with any block of the bulkhead door, not just the base block.
…tively when the block is moved, not just when created.
Acuadragon100
force-pushed
the
dev/1.20.1-merge-from-1.20.2
branch
from
8de1b49 to
bb3716f
Compare
This way, TARDIS Refined should in theory play more nicely with mods like Kilt or Sinytra.
…alkyrien Skies is installed.
Contributor
Author
…t it in getLevel if not already set instead.
…e a chunk loads even in a recently created TARDIS until the server is restarted.
…is_info.json` on reboot.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
Adds zeiton glass, sleeping upgrade, screen camera config, the texture/model changes and probably a few other smaller quality of life tweaks from 1.20.2 into 1.20.1.
I also went ahead and fixed a few minor bugs I noticed.
Note that the changelog has not been updated with the changes from 1.20.2 (mostly because I'm not sure how you want to word them).
Supersedes #598