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.

Sign up for GitHub

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

Spacewars and Medieval Oak fixes and Minecolonies Original and Colonial additions in 1.20.1 #10289

Merged
merged 6 commits into from
Sep 29, 2024
Merged

Spacewars and Medieval Oak fixes and Minecolonies Original and Colonial additions in 1.20.1 #10289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
46694b3
Revert "New supply camp and ship for Spacewars"
MotionlessTrain Sep 29, 2024
17c722b
Actually replace supply camp and ship
MotionlessTrain Sep 29, 2024
bf59a6f
Fix missing item frames, and borked shingle slabs at the medieval oak…
MotionlessTrain Sep 29, 2024
d315120
New playerhouses
MotionlessTrain Sep 29, 2024
32ab9de
Add the repair state
MotionlessTrain Sep 29, 2024
1804a03
Fix path
MotionlessTrain Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added ...main/resources/blueprints/minecolonies/colonial/decorations/housing/playerhouse.blueprint
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/blueprints/minecolonies/medievaloak/fundamentals/builder1.blueprint
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/blueprints/minecolonies/medievaloak/fundamentals/builder2.blueprint
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/blueprints/minecolonies/medievaloak/fundamentals/builder3.blueprint
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/blueprints/minecolonies/medievaloak/fundamentals/builder4.blueprint
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/blueprints/minecolonies/medievaloak/fundamentals/builder5.blueprint
View file
Open in desktop
Binary file not shown.
Binary file added ...in/resources/blueprints/minecolonies/original/decorations/housing/playermansion.blueprint
View file
Open in desktop
Binary file not shown.
Binary file added ...es/blueprints/minecolonies/original/decorations/housing/playermansion_invisible.blueprint
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/blueprints/minecolonies/spacewars/decorations/supplies/camp.blueprint
View file
Open in desktop
Binary file not shown.
Binary file modified src/main/resources/blueprints/minecolonies/spacewars/decorations/supplies/ship.blueprint
View file
Open in desktop
Binary file not shown.
Binary file modified ...ain/resources/blueprints/minecolonies/spacewars/decorations/supplies/supplycamp.blueprint
View file
Open in desktop
Binary file not shown.
Binary file modified ...ain/resources/blueprints/minecolonies/spacewars/decorations/supplies/supplyship.blueprint
View file
Open in desktop
Binary file not shown.