This repository has been archived by the owner on Jul 18, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 3
Space stations #26
Open
marcus8448
wants to merge
20
commits into
dev/0.4
Choose a base branch
from
dev/0.4+satellites
base: dev/0.4
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Space stations #26
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
add hook for setting sky/weather/etc. providers for the world
update to DynWorlds 0.2.0
# Conflicts: # build.gradle.kts # gradle.properties # src/main/java/dev/galacticraft/api/satellite/Satellite.java # src/main/java/dev/galacticraft/api/satellite/SpaceStationRecipe.java # src/main/java/dev/galacticraft/api/universe/celestialbody/landable/Landable.java # src/main/java/dev/galacticraft/api/universe/celestialbody/satellite/Orbitable.java # src/main/java/dev/galacticraft/api/universe/display/CelestialDisplay.java # src/main/java/dev/galacticraft/api/universe/display/CelestialDisplayType.java # src/main/java/dev/galacticraft/impl/internal/client/fabric/GalacticraftAPIClient.java # src/main/java/dev/galacticraft/impl/internal/command/GCApiCommands.java # src/main/java/dev/galacticraft/impl/internal/mixin/MinecraftServerAccessor.java # src/main/java/dev/galacticraft/impl/internal/mixin/MinecraftServerMixin.java # src/main/java/dev/galacticraft/impl/internal/mixin/PlayerManagerMixin.java # src/main/java/dev/galacticraft/impl/internal/mixin/client/ClientPlayNetworkHandlerMixin.java # src/main/java/dev/galacticraft/impl/internal/world/gen/SatelliteChunkGenerator.java # src/main/java/dev/galacticraft/impl/universe/celestialbody/type/DecorativePlanet.java # src/main/java/dev/galacticraft/impl/universe/celestialbody/type/PlanetType.java # src/main/java/dev/galacticraft/impl/universe/celestialbody/type/SatelliteType.java # src/main/java/dev/galacticraft/impl/universe/display/type/EmptyCelestialDisplayType.java # src/main/java/dev/galacticraft/impl/universe/display/type/IconCelestialDisplayType.java
# Conflicts: # src/main/java/dev/galacticraft/impl/universe/celestialbody/type/SatelliteType.java
# Conflicts: # build.gradle.kts
update to dynamic dimensions 0.4.0-SNAPSHOT
# Conflicts: # src/main/java/dev/galacticraft/impl/universe/position/config/SpaceStationConfig.java
# Conflicts: # src/main/java/dev/galacticraft/impl/internal/command/GCApiCommands.java
# Conflicts: # build.gradle.kts # gradle.properties # src/main/java/dev/galacticraft/api/accessor/ChunkSectionOxygenAccessor.java # src/main/java/dev/galacticraft/api/accessor/GearInventoryProvider.java # src/main/java/dev/galacticraft/impl/rocket/RocketDataImpl.java # src/main/resources/fabric.mod.json
JustPyrrha
approved these changes
Dec 20, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
resolve merge conflicts and itll be good to go, also please ping me in discord when you request me for review
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
/space_station
Runtime dimension creation/removal is now handled by an external library TeamGalacticraft/DynamicDimensions - you might want to take a look at it.