Skip to content

1.21.1 DO NOT MERGE #923

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
Closed
mrh0 wants to merge 108 commits into from
Closed

1.21.1 DO NOT MERGE #923

mrh0 wants to merge 108 commits into from

Conversation

@mrh0
Copy link
Owner

@mrh0 mrh0 commented Apr 13, 2025

Diff

mrh0 and others added 30 commits March 20, 2025 00:52
@mrh0
wip 1.21.1
23d5509
@mrh0
port wip
34a11c9
@mrh0
wip
292e8c5
@mrh0
port wip
cd8b48d
@mrh0
wip porting
bb7baa7
@mrh0
wip porting
0b5caec
@mrh0
wip porting
ddf0c91
@mrh0
wip porting recipes
cd6c135
@piotrenewicz
typo was fixed upstream in BootstrapContext
dec43bf
@piotrenewicz
port IClientItemExtensions
b6c12dd
@piotrenewicz
IEnergyStorage migration was missed
91ddb30
@piotrenewicz
distmarker migration was missed
6c18886
@piotrenewicz
DeferredHolder .isPresent() method seems to be renamed to .isBound()
5d6de39
@piotrenewicz
create.AllTags.forgeItemTag seems to be reimplemented as commonItemTag
a95515d
@piotrenewicz
import mezz.jei.api ported from forge.ForgeTypes to neoforge.NeoForge…
731a904 
…Types
@piotrenewicz
playerWillDestroy ported to playerDestroy
14537de
@piotrenewicz
method names changed in VertexConsumer, ported WireNodeRenderer to us…
d07f923 
…e new method names.
@piotrenewicz
fixed wrong number of arguments in CADisplaySources
481c0b3
@mrh0
wip processing recipes porting
28574ba
@L-Lawlite
Added package-info.java to remove warnings.
7fbeaa8
@L-Lawlite
Added package-info.java to remove warnings.
3c038b4
@L-Lawlite
Rarity is now an item property so there is no method for it
ba3fed7
@L-Lawlite
Changed playerWillDestroy method signature to match super class
49f16d9
@L-Lawlite
Changed forge Capabilities to neoforge Capabilities in import
7cfda68
@L-Lawlite
Changed from forge tags to commonTags
3e8a818
@L-Lawlite
Changed the ResourceLocation builder to newer format
219be98
@L-Lawlite
Changed the ResourceLocation builder to newer format
dc4006d
@L-Lawlite
Added comments for questions
4a79d60
@mrh0
Merge pull request #916 from piotrenewicz/1.21.1-piotrenewicz
d581e2c 
Helping with port to 1.21.1
@L-Lawlite
Added comments to remind the implementation changes
01a86f0
L-Lawlite and others added 29 commits April 16, 2025 19:15
@L-Lawlite
Added missing electrum_block.json
5c44881
@L-Lawlite
Merge
a3205ce
@L-Lawlite
Deleted wrong loot data gen
73832b3
@mrh0
Merge pull request #935 from L-Lawlite/1.21.1
fb647c9 
1.21.1
@L-Lawlite
Added data gen for changing recipe
f81d63b
@L-Lawlite
Merge branch 'mrh0:1.21.1' into 1.21.1
f8d4dc4
@mrh0
Merge pull request #936 from L-Lawlite/1.21.1
ade486d 
1.21.1
Rolling Recipe fix & Datagen
bb0535d
@mrh0
wip rolling and liquid burning recipe datagen
dc23794
@mrh0
fixed data
360c96e
small fixes
dcc4b69
Weathered Copper Shingle Stairs
efecf24
@L-Lawlite
Dynamic deoxidization recipes
1f606d3
Merge remote-tracking branch 'origin/1.21.1' into 1.21.1-skippyall
c533913 
# Conflicts:
#	src/main/java/com/mrh0/createaddition/datagen/CreateAdditionsDataGen.java
#	src/main/java/com/mrh0/createaddition/datagen/RecipeBuilders/CARollingRecipeBuilder.java
#	src/main/java/com/mrh0/createaddition/datagen/RecipeProvider/CARollingRecipeProvider.java
#	src/main/java/com/mrh0/createaddition/recipe/rolling/RollingMillRecipeParams.java
#	src/main/java/com/mrh0/createaddition/recipe/rolling/RollingRecipe.java
@L-Lawlite
Space fixes
600c663
@L-Lawlite
Merge
f8866d1
@mrh0
liquid burning datagen
9dd98be
@mrh0
Merge pull request #939 from L-Lawlite/1.21.1
aae9a05 
1.21.1
Merge remote-tracking branch 'refs/remotes/origin/1.21.1' into 1.21.1…
f0737f5 
…-skippyall

# Conflicts:
#	src/main/java/com/mrh0/createaddition/datagen/RecipeProvider/CAChargingRecipeProvider.java
#	src/main/java/com/mrh0/createaddition/datagen/RecipeProvider/CARollingRecipeProvider.java
#	src/main/java/com/mrh0/createaddition/recipe/rolling/RollingMillRecipeParams.java
No more Weathered Copper Shingle Stairs
a12e27b
Already fueled
596e0d3
@mrh0
Merge pull request #938 from skippyall/1.21.1-skippyall
5488265 
 Rolling Recipe fix & Datagen
@mrh0
Update CreateAdditionJEI.java
ebe33b5
Reenable Computercraft Compat
2270916
@mrh0
fixed jei
7232b08
@L-Lawlite
Manually fixed rolling recipes for immersiveengineering
104ae8a
@L-Lawlite
Fixed compat recipes manually
9dce401
@mrh0
Merge pull request #945 from L-Lawlite/1.21.1
b448aa9 
1.21.1
@mrh0
Merge pull request #940 from skippyall/1.21.1-computercraft
7fc83a4 
Reenable Computercraft Compat
@mrh0 mrh0 closed this Apr 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@mrh0 @piotrenewicz @L-Lawlite @Evoloxi