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

Jump to bottom

1.20 update #324

Merged
merged 93 commits into from
May 10, 2024
Merged

1.20 update #324

merged 93 commits into from
May 10, 2024

Conversation

okx-code
Copy link
Contributor

No description provided.

MrJeremyFisher and others added 30 commits February 20, 2024 12:37
@MrJeremyFisher
1.20.4
637c082
@MrJeremyFisher
1.20.4
94a5e02
@MrJeremyFisher
update tags
f236c91
@MrJeremyFisher
1.20.4
c6557dd
@MrJeremyFisher
Update PseudoServer
e3be9f2
@okx-code
Merge pull request #264 from MrJeremyFisher/cmc-1.20
8ff6f0f 
CivModCore 1.20.4
@MrJeremyFisher
1.20.4
3fd00b8
@MrJeremyFisher
Sculk spread and mud drying protections
0780974
@okx-code
Merge pull request #272 from MrJeremyFisher/namelayer-1.20
03c2cd0 
NameLayer 1.20.4
@MrJeremyFisher
Nicer dirt -> mud blocker
7f04dc3
@MrJeremyFisher
Chiseled bookshelf hopper check and remove unnecessary sculk check
74e3cd3
@MrJeremyFisher
Fix null connection error
5b6ded0
@okx-code
Merge pull request #274 from MrJeremyFisher/namelayer-1.20
6c01a6d 
Fix null connection error in NameLayer 1.20
@okx-code
Merge pull request #271 from MrJeremyFisher/ctplus-1.20
05dce9d 
CombatTagPlus 1.20.4
@MrJeremyFisher
Prevent editing of reinforced signs if not on group
0912ea8
@MrJeremyFisher
Merge branch 'mc/1.20' into citadel-1.20
1df620b
@okx-code
Merge pull request #276 from MrJeremyFisher/citadel-1.20
511ea19 
Citadel 1.20.4
@MrJeremyFisher
1.20.4
13ae0ed
@MrJeremyFisher
Add saplings
bfb1972
@okx-code
Merge pull request #279 from MrJeremyFisher/mc/sah-1.20
e792c54 
SimpleAdminHacks 1.20.4
@okx-code
fix compilation errors
0bbbefa
@okx-code
fix bad plugin name
5bc7e3b
@okx-code
Merge branch 'finale' into mc/1.20
1cf7208
@okx-code
Update finale to 1.20
0aac6fe
@okx-code
Update RandomSpawn to 1.20
ddacd85
@okx-code
Update JukeAlert to 1.20
7e6a235
@okx-code
Update ItemExchange to 1.20
8d23e72
@okx-code
Update CivChat2 to 1.20
2abb502
@MrJeremyFisher @okx-code
1.20.4
f79fdfb
@okx-code
Merge branch 'factorymod' into mc/1.20
c8cb717 
# Conflicts:
#	settings.gradle.kts
@github-actions GitHub Actions
Copy link
Contributor

badge

Build Successful! You can find a link to the downloadable artifact below.

Name Link
Commit ac975b3
Logs https://github.com/CivMC/Civ/actions/runs/9034153069
Download https://github.com/CivMC/Civ/suites/23655112220/artifacts/

@okx-code okx-code marked this pull request as ready for review May 10, 2024 15:16
@RedDevel2 RedDevel2 merged commit 50e8681 into main May 10, 2024
2 checks passed
@RedDevel2 RedDevel2 deleted the mc/1.20 branch May 11, 2024 11:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RedDevel2 RedDevel2 RedDevel2 approved these changes

Assignees

@okx-code okx-code

@RedDevel2 RedDevel2

Labels
Category: Feature Priority: High
Projects
CivMC Roadmap
Archived in project
Milestone
2.0.0 - Minecraft 1.20
Development

Successfully merging this pull request may close these issues.
5 participants
@okx-code @RedDevel2 @AngrySoundTech @MrJeremyFisher @jaymsDooku