Update feature/hyperloop to latest build of Galacticraft #480
Conversation
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
fix: register cavernous_vines_plant as only a block and not with an item
…anks with a rainbow color change
…cticraft#416) * feat: added hissing noise and white smoke particles when an entity is in sulfuric acid * feat: added fluid fog/overlays for oil, fuel and sulfuric acid * feat: added fluid tag for non-breathable fluids that you can drown in * fix: make fuel and sulfuric acid translucent * fix: don't apply fluid fog when the camera is outside of the fluid * refactor: address comments from review * fix: check for Galacticraft fluids only not using fluid tags * refactor: add additional fluid tags in the galacticraft namespace
…ve the cloud layer
…ther than only showing integer values
…e (drops and experience still need balancing for all ores)
… with existing textures
* fix: use translucent mode for glass pipes * fix: clear glass fluid pipe * fix: fluid pipes being broken by water * feat: remove dye from fluid pipe with water bucket or wet sponge * chore: license header * chore: clean up unused imports
…raft#400) * feat: prevent elytra from working in a vacuum like CLtheman1 mentioned * feat: wrote mixin to make fall damage proportional to gravity (resolves TeamGalacticraft#389) * refactor: make use of galacticraft$hasDimensionTypeTag method elsewhere * refactor: replaced redirects with ModifyExpressionValue * feat: increase the drag when flying proportionally to the atmospheric pressure and use the value of the pressure rather than GCTags.VACUUM to determine when the atmosphere is too thin for flight * refactor: rewrite mixin for calculating fall damage to no longer use unconditional return values * chore: update license headers * refactor: revert back to using VACUUM tag rather than checking the atmospheric pressure
* feat: implemented invalid oxygen setup warning and also added warning signs to the lander warning * fix: prevent beds from exploding in space and provide oxygen when in cryogenic chamber/lander * fix: allow players to sleep in beds in space if and only if that position is breathable * refactor: removed attempt to change the time on other dimensions after sleeping (might need major rewrite) * refactor: remove unused imports * fix: prevent air bubbles from being depleted when inside oxygen bubble created by bubble distributor * fix: adjust when the oxygen warning is shown * feat: add less obtrusive warning for if the player currently has oxygen, but has an invalid oxygen setup
…tank, but not a mask and gear
…n cheese block/log
- this is no longer be used anymore
* feat: start working on a block entity renderer for the rocket workbench to allow for animations * chore: positioning parts of RocketWorkbenchBlockEntityRenderer * feat: all parts now correctly positioned * feat: make the rocket workbench a horizontally rotatable block * feat: added rocket workbench item model and updated data generation * fix: fine tuning to match the original blockbench model even closer * refactor: tidy up a little bit * chore: replace old NASA workbench files for programmer art pack * chore: remove unused import * refactor: replace multipart with variants in rocket workbench blockstate * chore: make machines require at least a stone pickaxe to break * fix: rotate rocket workbench in third person left hand
…eamGalacticraft#462) * feat: prevent oxygen tank drain when wearing infinite capacity tank * Check if the item is instanceof InfiniteOxygenTankItem, and start the loop from 1.
… tag for uncannable foods
…a mask/in a non-breathable environment
…ch tag type (TeamGalacticraft#427) * fix: replaced hardcoded message about the owner of an airlock with a translatable string * fix: replaced hardcoded creative tooltip for rocket item with translatable string * fix: replaced hardcoded disconnect message with a translatable string * fix: replaced hardcoded name for the Parachest block entity with the name of the Parachest block * feat: add .player death messages for when a player or entity had recently harmed the player * fix: added missing entity.galacticraft.moon_villager.none translation * refactor: corrected typo RECIPE_VEIWER_DISPLAY_TEXTURE * refactor: fixed typo tirer_1_rocket * chore: translated item tags * chore: adjusted item tag translations including pluralizing them * chore: started tagging items * chore: separated GCTags into a file for each tag type and tagged more blocks/items * chore: added a few more tags * chore: added more block/item tags * chore: added #galacticraft:decoration_blocks block tags split into subgroups for each type of metal * fix: changed wrench tag to match new fabric ConventionalItemTags.WRENCH_TOOLS for future compatiability (1.21.4) * chore: included GCDamageTypeTagProvider from branch Roelymole:oxygen * Merge branch 'main' of https://github.com/TeamGalacticraft/Galacticraft into tags * feat: make use of new conventional tags in fabric * chore: updated fabric for latest conventional tags and added more tags * Merge branch 'main' of https://github.com/TeamGalacticraft/Galacticraft into tags * chore: added item tag translations to address the fabric conventional tags warning Dev warning - Untranslated Item Tags detected. Please translate your item tags so other mods such as recipe viewers can properly display your tag's name. * chore: run gradlew updateLicences * Merge branch 'main' of https://github.com/TeamGalacticraft/Galacticraft into tags * chore: resolve conflicts from merging * refactor: change GCTags to GCDimensionTypeTags * Merge branch 'main' of https://github.com/TeamGalacticraft/Galacticraft into tags * fix: remove duplicates from merging * refactor: remove more duplicate code and reorder some tags * refactor: update and reorder tags * fix: corrected machine recipes * chore: rerun datagen to fix failing tests * chore: added ore_bearing_ground and ores_in_ground tags * refactor: copy the corresponding block tag when generating item tags where possible * chore: copied slabs, stairs and walls block tags to item tags and other reformatting * chore: add to cobblestones tags as well as stone_tool_materials and stone_crafting_materials * fix: use item tags in recipes where appropriate * chore: translated new item tags to prevent warning * chore: add ores to ConventionalBlockTags.ORE_RATES_DENSE and ConventionalBlockTags.ORE_RATES_SPARSE according to current drops * chore: add to stones block/item tags * chore: add stones.json tag files * Merge branch 'main' of https://github.com/TeamGalacticraft/Galacticraft into tags * fix: change instance of GCTags to GCBlockTags * chore: rerun datagen * chore: make adjustments to GCBlockTagProvider * chore: improve item tag support for recipes * fix: reimplement findValidRecipe to use item tags * refactor: adjust the use of item tags for the fabrication recipes * refactor: remove unused imports and swap order of two methods * fix: remove electric (arc) furnace from PLAYER_WORKSTATIONS_FURNACES tags * chore: further small adjustments of the use of item tags in recipes * refactor: replace tabs with spaces
Adjust the positioning and rotation of the oxygen tanks/gear when crouching Align the oxygen mask with the top of the evolved enderman's head so that it doesn't look weird when they scream
… player data crash
…in lower gravity environments
…rce location is null (resolves TeamGalacticraft#473)
# Conflicts: # src/main/java/dev/galacticraft/mod/client/render/block/entity/GCBlockEntityRenderer.java # src/main/java/dev/galacticraft/mod/content/block/special/TransportTube.java # src/main/java/dev/galacticraft/mod/content/teleporters/OverworldCelestialTeleporterType.java # src/main/resources/galacticraft.mixins.json
Codetoil
changed the title
* fix: remove face between connected fluid pipes * fix: patch hole in dyed fluid pipe textures * refactor: separate stained glass fluid pipes into separate blocks * fix: glass fluid pipes being shrunken * fix: the other pipes and wires too * wip: more things and stuff * fix: fluid pipes not updating when neighboring machine port opens * wip: use pipe block state for network connections * fix: infinite pipe update loop? * wip: more things * refactor: cleaner fluid pipe registration * refactor: use baked model for glass pipes again * fix: glass pipe UVs * fix: for real this time * feat: glass fluid pipe item models * feat: make glass fluid pipes fluid-loggable * feat: fluid pipe recipes * feat: stained glass fluid pipe translations * refactor: split pipe shape code into separate class * wip: start on fluid pipe walkways * wip: more walkway work * feat: proper walkway models * fix: merge issues * refactor: remove fluid pipe walkway block entity * fix: various walkway connection issues * misc: remove old glass fluid pipe textures * feat: walkway item models * misc: copy walkway block properties from the underlying block * misc: add warning for walkway center model sometimes the fluid pipe walkway's block entity just doesn't get saved? * fix: unify walkway placement and voxel shape * fix: real bad culling oh boy * fix: more culling issues * fix: pipes not being removed from network * chore: licenses * refactor: switch aluminum wires to new baked model * feat: make aluminum wires fluidloggable and clean up code * fix: update pipe item models and apply to aluminum wire * chore: use galacticraftTag function * fix: wire walkway using wrong model * feat: add stained glass fluid pipes to creative tab * fix: stable ordering of fluid pipes in tags * fix: sealable wire blocks having huge hitbox * feat: craft stained glass pipes from stained glass panes * fix: heavy sealable wire hitbox and various cleanups * fix: pipes/wires not updated on client when machine changes IO mode * chore: remove redundant updateConnection function * fix: make regular walkway fluidloggable * chore: more cleanup * fix: wire walkways having a delayed update * chore: remove pointless `level.updateNeighborsAtExceptFromFacing` calls * chore: clean up FluidPipeBlock::useItemOn * fix: calculate connections immediately when dyeing a fluid pipe * feat: nicer debug output for PipeNetworkImpl * refactor: better fluid pipe tags * fix: track files
# Conflicts: # src/main/java/dev/galacticraft/mod/data/model/GCModelProvider.java
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 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.
No description provided.