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

Ritual fixes #453

Merged
merged 7 commits into from
Jun 1, 2024
Merged

Ritual fixes #453

merged 7 commits into from
Jun 1, 2024

Conversation

IchHabeHunger54
Copy link
Contributor

This PR:

  • Changes the Light spell to no longer use the vanilla light block and instead use our own newly-created spell light block now
  • Changes some silver spell unlock rituals to be a bit easier and more consistent with each other
  • Specifies that the bottom block of the obelisk must be targeted for corruption/purification rituals in the compendium

IchHabeHunger54 and others added 5 commits May 16, 2024 14:44
@IchHabeHunger54
adjust spell unlock gametests
f68c1ee
@IchHabeHunger54
apparently BlockBehaviour.Properties#copy doesn't copy noLootTable(),…
576254d 
… so we need to fix that
@IchHabeHunger54
Merge branch 'refs/heads/version/1.20.1' into fix/rituals
0a83693 
# Conflicts:
#	src/main/generated/.cache/0d76207f7d4af0d57164bec6a55c1bbbfe4c9bf7
#	src/main/generated/.cache/ff85aeffff7b400453d938ac4326ddfe68257a73
@IchHabeHunger54
run datagen
93635fc
@IchHabeHunger54
Merge branch 'version/1.20.1' into fix/rituals
600da39
@IchHabeHunger54 IchHabeHunger54 enabled auto-merge (squash) June 1, 2024 15:12
@IchHabeHunger54 IchHabeHunger54 merged commit 41ca848 into version/1.20.1 Jun 1, 2024
1 check passed
@Minecraftschurli Minecraftschurli deleted the fix/rituals branch June 11, 2024 09:39
IchHabeHunger54 added a commit that referenced this pull request Jun 16, 2024
@IchHabeHunger54
port #453
afd29a1
@IchHabeHunger54 IchHabeHunger54 mentioned this pull request Jul 15, 2024
Merged
Minecraftschurli added a commit that referenced this pull request Jul 29, 2024
@IchHabeHunger54 @Minecraftschurli
Port changes on 1.20.1 to 1.20.4 (#456)
f899239 
* port #447

* port #450

* port #451

* port #452

* port #453

* port #454

* bump gradle stuff

* fix gradle setup

* run datagen

* fix leveling not properly initiating

* Fix gradle issues

---------

Co-authored-by: Minecraftschurli <minecraftschurli@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Minecraftschurli Minecraftschurli Minecraftschurli approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@IchHabeHunger54 @Minecraftschurli