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

Zeta 1.20 minor porting (#1) #4416

Merged
merged 6 commits into from
Nov 22, 2023
Merged

Zeta 1.20 minor porting (#1) #4416

merged 6 commits into from
Nov 22, 2023

Conversation

Siuolplex
Copy link
Member

Alternative name: "Zeta 1.20 port ig" (Courtesy of IThundxr)

Ill have a better name for these I swear
For any on-lookers NO THIS IS NOT A FINAL FINISHED PORT OF IT I literally am just trying to sweep up some small scraps whilst I get my footing on helping out Quark

…t at 1066)

Idk I just got here
Anyways I did some simple stuff.
@Siuolplex Siuolplex changed the title Zeta 1.20 Porting Zeta 1.20 minor porting (#1) Nov 20, 2023
@IThundxr IThundxr self-assigned this Nov 20, 2023
…rrors: 1029)

Cuts the project errors further, but still not much, if any contributor has a recommendation for somewhere for me to fix up give me a holler
* = This isnt including the newest commits from upstream
I need better commit names
# Conflicts:
#	src/main/java/org/violetmoon/quark/content/building/block/RainbowLampBlock.java
#	src/main/java/org/violetmoon/quark/content/building/module/MoreStoneVariantsModule.java
#	src/main/java/org/violetmoon/quark/content/building/module/RopeModule.java
#	src/main/java/org/violetmoon/quark/content/mobs/client/layer/shiba/ShibaMouthItemLayer.java
#	src/main/java/org/violetmoon/quark/content/mobs/entity/Shiba.java
#	src/main/java/org/violetmoon/quark/content/tools/client/render/entity/PickarangRenderer.java
#	src/main/java/org/violetmoon/quark/content/tools/module/SeedPouchModule.java
#	src/main/java/org/violetmoon/quark/content/tweaks/module/SimpleHarvestModule.java
#	src/main/java/org/violetmoon/quark/content/world/module/NewStoneTypesModule.java
@quat1024 quat1024 merged commit 88679f1 into VazkiiMods:zeta120 Nov 22, 2023
1 check failed
@quat1024 quat1024 mentioned this pull request Nov 22, 2023
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.

3 participants