-
Notifications
You must be signed in to change notification settings - Fork 17
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge development code into master #102
Open
UntouchedOdin0
wants to merge
44
commits into
master
Choose a base branch
from
development
base: master
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
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
Fix for pregen factory not using the correct border distance Fix the Materials not loading correctly from the sqllite database Fix flags not being set
Fix commands?
Improve gradle script for compile speed. Added sendpacket debug command
Tidy up the PrivateMinesCommand#claim command
The old class of SchematicIteratorOriginal was causing some performance issues whereas the new one uses multiple threads to spread the load.
Refactored SchematicIterator to make it more tidy.
Fixes the god forsaken error https://pastes.dev/Pneu9IbYbm
Changed quantity from int to long Added a Syntax to PlayerShopCommand#pricesDebugAdd
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.
This merge integrates the latest code into the
master
branch, addressing an oversight where recent updates were not previously merged. The code in this merge represents the most current and up-to-date version, incorporating all recent changes and improvements.