Skip to content
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

update to v3.4 #15

Merged
merged 34 commits into from
May 9, 2022
Merged

update to v3.4 #15

merged 34 commits into from
May 9, 2022

Conversation

liplum
Copy link
Owner

@liplum liplum commented May 9, 2022

There are too many features added and a huge change of the structure of whole repositry.
It's hard to list them one by one here.
So, don't hesitate, just merge this!

liplum added 30 commits May 5, 2022 10:42
…ls(Java) (prog-mats) v24.0.

Added some basic codes for TechTree.
underdrive:(stat) speed increase, power generation
stream host/server:(stat/code) power use depends on connection number
Deleter:(stat) bullet execution
distributor:support item turret
…ls(Java) (prog-mats) v24.0.

Added some basic codes for TechTree.
underdrive:(stat) speed increase, power generation
stream host/server:(stat/code) power use depends on connection number
Deleter:(stat) bullet execution
distributor:support item turret
# Conflicts:
#	assets/bundles/bundle.properties
#	assets/bundles/bundle_ja.properties
#	mod.hjson
#	src/net/liplum/blocks/stream/StreamServer.kt
Used ()->Shader instead of Shader.
Fixed ear doesn't consume power.
Added freely unlocking and locking.
Fixed tech tree.
@liplum
Copy link
Owner Author

liplum commented May 9, 2022

Perfect! Merge!

@liplum liplum merged commit 31dd2ef into master May 9, 2022
@liplum liplum deleted the v3.4 branch May 9, 2022 11:05
@liplum liplum changed the title update tp v3.4 update to v3.4 May 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant