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

Update to FAPI 0.91.0+1.20.1 #140

Merged
merged 12 commits into from
Feb 1, 2024
Merged

Update to FAPI 0.91.0+1.20.1 #140

merged 12 commits into from
Feb 1, 2024

Conversation

Kneelawk
Copy link

This PR

This PR updates QFAPI to match FAPI 0.91.0+1.20.1.

Associated

Shnupbups and others added 9 commits October 22, 2023 13:46
@Shnupbups @modmuss50
Fix FabricBlockSettings copyOf missing settings (FabricMC#3373)
4ee0bc6 
Fixes FabricBlockSettings' copyOf method missing several new settings introduced as a result of the removal of Materials.

Specifically, burnable, liquid, forceNotSolid, forceSolid, pistonBehavior, instrument, and replaceable. These are all copied by the vanilla `BlockSettings.copy` as well.
The emissiveLightingPredicate is also now copied in vanilla, so I moved the copy of that to reflect that change.

(cherry picked from commit 2ff98d3)
@modmuss50
Bump version
050aeb4
@Estecka @modmuss50
Fix Doubles not being editable in the game-rule menu (FabricMC#3397)
ae9f657 
* Fix double gamerules rules not being editable in menu

* Updated `validate`'s javadoc

(cherry picked from commit a44e16a)
@Technici4n @modmuss50
Fix log spam with multiple calls to combinedItemApiProvider (Fabric…
1bc31ae 
…MC#3387)

(cherry picked from commit d6f4a34)
(cherry picked from commit bb1ee60)
@modmuss50
Bump version
cff3450
@Technici4n @modmuss50
Fix empty storage iterator returning views that become empty during i…
c81d263 
…teration (FabricMC#3423)

(cherry picked from commit aaf9c96)
(cherry picked from commit 9ab11d5)
@modmuss50
Fix registry resource conditions on loot tables. (FabricMC#3432)
29de845 
* Fix registry resource conditions on loot tables.

* assert we dont already have the DRM set on this thread.

* Use a sync map

(cherry picked from commit de5c6cc)
(cherry picked from commit 239dafd)
@modmuss50
Bump version
9c89d33
@Kneelawk
Merge remote-tracking branch 'fabric/1.20.1' into update/fapi-0.91.0+…
bf1d686 
…1.20.1
@Kneelawk
Copy link
Author

I can squash some of the commits if need be.

@ix0rai ix0rai self-requested a review December 27, 2023 23:21
@ix0rai
Copy link
Member

ix0rai commented Dec 30, 2023

I can squash some of the commits if need be.

we don't squash commits on QFAPI, don't worry about it

@OroArmor
Copy link
Member

What is the status on this PR? does it need to sync QSL?

@OroArmor
Copy link
Member

Edit: Oh i see. no QSL sync needed. How is the rest of the PR?

OroArmor
OroArmor approved these changes Feb 1, 2024
View reviewed changes
gradle.properties Outdated Show resolved Hide resolved
@OroArmor OroArmor merged commit 24b4056 into QuiltMC:1.20.1 Feb 1, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ix0rai ix0rai ix0rai approved these changes

@OroArmor OroArmor OroArmor approved these changes

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

Successfully merging this pull request may close these issues.
7 participants
@Kneelawk @ix0rai @OroArmor @Shnupbups @modmuss50 @Estecka @Technici4n