Skip to content

Commit c4442fc

Browse files
committed
Update Neo
1 parent 507c83d commit c4442fc

File tree

45 files changed

+87
-91
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+87
-91
lines changed

.github/ISSUE_TEMPLATE/general_issue.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ body:
2525
description: What version of Minecraft are you using?
2626
options:
2727
- 1.20.4 (Latest)
28+
- 1.20.6 (Dev Branch, Manually Compiled)
2829
- 1.20.1 or earlier (No longer being developed)
2930
validations:
3031
required: true

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ minecraft_version=1.20.6
88
previous_minecraft_version=1.20.1
99
previous_minor_minecraft_version=1.20.4
1010
loader_version_range=[2,)
11-
forge_version=20.6.22-beta
11+
forge_version=20.6.31-beta
1212
mod_version=10.5.20
1313
#This determines the minimum version of forge required to use Mekanism
1414
# Only bump it whenever we need access to a feature in forge that is not available in earlier versions
15-
forge_version_range=[20.6.22-beta,)
15+
forge_version_range=[20.6.23-beta,)
1616
minecraft_version_range=[1.20.6]
1717
#This specifies what type of release it will be uploaded to CurseForge and Modrinth as
1818
# options are: alpha, beta, release

src/additions/java/mekanism/additions/common/item/ItemWalkieTalkie.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ public record WalkieData(int channel, boolean running) {
8181
public static final WalkieData DEFAULT = new WalkieData(1, false);
8282

8383
public static final Codec<WalkieData> CODEC = RecordCodecBuilder.create(instance -> instance.group(
84-
//TODO - 1.20.5: Validate this range
8584
ExtraCodecs.intRange(1, 8).fieldOf(NBTConstants.CHANNEL).forGetter(WalkieData::channel),
8685
Codec.BOOL.fieldOf(NBTConstants.RUNNING).forGetter(WalkieData::running)
8786
).apply(instance, WalkieData::new));

src/api/java/mekanism/api/chemical/ChemicalStack.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ protected static <CHEMICAL extends Chemical<CHEMICAL>> Codec<CHEMICAL> chemicalN
6262
*/
6363
protected static <CHEMICAL extends Chemical<CHEMICAL>, STACK extends ChemicalStack<CHEMICAL>> MapCodec<STACK> codec(Codec<CHEMICAL> nonEmptyCodec,
6464
BiFunction<CHEMICAL, Long, STACK> constructor) {
65-
//TODO - 1.20.5: Figure out if this needs to be lazily initialized. I don't think it does, but for fluids and items it is, probably because of components?
6665
return RecordCodecBuilder.mapCodec(instance -> instance.group(
6766
nonEmptyCodec.fieldOf(NBTConstants.ID).forGetter(ChemicalStack::getChemical),
6867
SerializerHelper.POSITIVE_LONG_CODEC.fieldOf(JsonConstants.AMOUNT).forGetter(ChemicalStack::getAmount)
@@ -78,7 +77,6 @@ protected static <CHEMICAL extends Chemical<CHEMICAL>, STACK extends ChemicalSta
7877
*/
7978
protected static <CHEMICAL extends Chemical<CHEMICAL>, STACK extends ChemicalStack<CHEMICAL>> Codec<STACK> fixedAmountCodec(
8079
Codec<CHEMICAL> chemicalNonEmptyCodec, BiFunction<CHEMICAL, Long, STACK> constructor, long amount) {
81-
//TODO - 1.20.5: Figure out if this needs to be lazily initialized. I don't think it does, but for fluids and items it is, probably because of components?
8280
return RecordCodecBuilder.create(instance -> instance.group(
8381
chemicalNonEmptyCodec.fieldOf(NBTConstants.ID).forGetter(ChemicalStack::getChemical)
8482
).apply(instance, holder -> constructor.apply(holder, amount)));

src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

Lines changed: 33 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/computer_help/jekyll.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/loot_tables/blocks/digital_miner.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/recipes/pigment_extracting/stained_glass/black.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)