Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
18 changes: 9 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
name: Mineralogy 26.2 NeoForge CI
name: Mineralogy 26.3 NeoForge CI

on:
push:
branches:
- master-26.2-neo
- master-26.3-neo
- 'feature/**'
pull_request:
branches:
- master-26.2-neo
- master-26.3-neo

permissions:
contents: read

concurrency:
group: mineralogy-26.2-neo-${{ github.workflow }}-${{ github.ref }}
group: mineralogy-26.3-neo-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
Expand Down Expand Up @@ -96,20 +96,20 @@ jobs:
- name: Upload audited release candidate
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
with:
name: Mineralogy-26.2-neoforge-${{ github.sha }}
name: Mineralogy-26.3-neoforge-${{ github.sha }}
if-no-files-found: error
retention-days: 30
path: |
build/libs/Mineralogy-6.1.2.2602002.jar
build/libs/Mineralogy-6.1.2.2602002-sources.jar
build/libs/Mineralogy-6.1.2.2602002-javadoc.jar
build/libs/Mineralogy-6.1.2.2603002.jar
build/libs/Mineralogy-6.1.2.2603002-sources.jar
build/libs/Mineralogy-6.1.2.2603002-javadoc.jar
build/release/SHA256SUMS
CHANGELOG.txt
- name: Upload diagnostics on failure
if: failure()
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
with:
name: Mineralogy-26.2-neoforge-diagnostics-${{ github.sha }}
name: Mineralogy-26.3-neoforge-diagnostics-${{ github.sha }}
if-no-files-found: ignore
retention-days: 14
path: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: CodeQL
on:
push:
branches:
- master-26.2-neo
- master-26.3-neo
- 'feature/**'
pull_request:
branches:
- master-26.2-neo
- master-26.3-neo
schedule:
- cron: '43 7 * * 4'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/validate-gradle-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ name: Validate Gradle Wrapper
on:
push:
branches:
- master-26.2-neo
- master-26.3-neo
- 'feature/**'
pull_request:
branches:
- master-26.2-neo
- master-26.3-neo

permissions:
contents: read
Expand Down
25 changes: 25 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
Mineralogy 6.1.2.2603002 for Minecraft 26.3 NeoForge

- Ported the accepted NeoForge 26.2 product to Minecraft 26.3 and NeoForge
26.3.0.1-beta while preserving registry, NBT, provider, configuration,
migration, recipe, locale, guide, crude-oil, texture, relief, mining,
furnace, creative-tab, and legacy-world identities.
- Updated all 1,454 recipe-unlock advancement criteria to Minecraft 26.3's
`recipes` field and retained explicit cooking times on all 28 cooking
recipes. The established native-rock, tuff, slab, stone-spear, and nineteen
configurable cobblestone routes remain unchanged.
- Added Minecraft 26.3's motion, fluid-washing, entity-flotation, and ore
semantic tags without making Mineralogy construction blocks vanilla ore
hosts or merging Mineralogy sulfur with Minecraft sulfur and cinnabar.
- Kept pre-flattening conversion input in the legacy `Name`/`Properties`
block-state schema so Minecraft's data fixer can produce modern lowercase
`id`/`properties` states. All 18,192 mappings and both Overworld region
layouts remain supported.
- Adapted crude-oil piston behavior, rock-furnace fuel components, and block
registration to the target APIs while preserving existing behavior and
saves.
- Updated metadata, packs, CI, documentation, and release audits for Minecraft
26.3, NeoForge 26.3.0.1-beta, OreSpawn 4.0.16.2603002, NeoGradle 7.1.39,
Java 25, resource format 97.1, and data format 121.0. Mineralogy still
registers no world generator.

Mineralogy 6.1.2.2602002 for Minecraft 26.2 NeoForge

- Ported the accepted NeoForge 26.1.2 product to Minecraft 26.2 and
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
[![Discord](https://img.shields.io/badge/Discord-MMD-green.svg?style=flat&logo=Discord)](https://discord.moddev.zone)
[![CurseForge downloads](https://cf.way2muchnoise.eu/full_minecraft-mineralogy_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/minecraft-mineralogy)
[![Supported Minecraft versions](https://cf.way2muchnoise.eu/versions/Minecraft_minecraft-mineralogy_all.svg)](https://www.curseforge.com/minecraft/mc-mods/minecraft-mineralogy)
[![Build, test, and audit](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml/badge.svg?branch=master-26.2-neo)](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml?query=branch%3Amaster-26.2-neo)
[![Build, test, and audit](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml/badge.svg?branch=master-26.3-neo)](https://github.com/MinecraftModDevelopmentMods/MinecraftMineralogy/actions/workflows/ci.yml?query=branch%3Amaster-26.3-neo)

# Mineralogy 6 for Minecraft 26.2
# Mineralogy 6 for Minecraft 26.3

Mineralogy adds real-world rock families, matching construction blocks,
mineral ores and dusts, rock furnaces, drywall, rock-salt lighting, fertilizer,
and crude oil. OreSpawn 4 is the sole terrain, strata, ore, and deposit engine;
Mineralogy no longer installs a parallel world generator.

This branch builds Mineralogy `6.1.2.2602002` for NeoForge `26.2.0.45-beta` and is built
and tested against OreSpawn `4.0.16.2602002`. Its declared compatibility range is
This branch builds Mineralogy `6.1.2.2603002` for NeoForge `26.3.0.1-beta` and is built
and tested against OreSpawn `4.0.16.2603002`. Its declared compatibility range is
OreSpawn `[4.0.6,5.0.0)`. Install both mods on clients and servers.

This is the NeoForge build. It is intentionally maintained separately from the
Forge 26.2 branch; use the jar that matches the loader in your modpack.
Forge 26.3 branch; use the jar that matches the loader in your modpack.

## Configuration and help

Expand Down
Loading
Loading