Upstream Lophine drift (26.2-hardfork): ddb4b75 #6

Open
opened 2026-09-09 06:01:22 +00:00 by forgejo-actions · 0 comments

Upstream exp/26.2-hardfork moved — manual merge needed (no auto-merge: experimental hardfork).

Pinned (ekaii-26.2): 1c025e6e89e35ed520e0fff7bbca2f96559b2843
Upstream HEAD: ddb4b7533d60ea07264c1aef7452f3f583e83062 (resolved via github)
ver/26.1.2 (informational): da005b117a464852dd8277acbc1fa82e545c864c

New commits

ddb4b75 [ci skip]refactor: rebrand to Lophine and fix checkstyle configuration
ee1217a [ci skip]refactor: enhance upstream update workflow with skip logic and improved checks

Patch-dir diffstat (lophine-server/{minecraft,paper}-patches)

(no changes under the patch directories, or range not resolvable)

Ekaii assets to preserve when merging

  • all ekaii patches: minecraft-patches 0133+ (copper-golems, boat-sleep/launcher-clusters, RegionFile-concurrent, and the ported opts Gale-|Leaf-|SparklyPaper-|CompoundTag|VarLong) AND paper-patches 0024+ — cross-check git diff --name-only <LOPHINE_UPSTREAM_SHA> HEAD -- luminol/lophine-server/*-patches
  • ekaii config sources: lophine-server/src/main/java/fr/ekaii/config/modules/** (ekaii instance) + the registerConfig("ekaii", …) line in ConfigManager + me/earthme/luminol/config/modules/optimizations/BoatLauncherSleepConfig.java
  • any cn/dreeam/leaf/util/** support classes added by ported opts (e.g. StringCanonizingOpenHashMap)
  • bump LOPHINE_UPSTREAM_SHA after the merge
Upstream `exp/26.2-hardfork` moved — **manual merge needed** (no auto-merge: experimental hardfork). Pinned (ekaii-26.2): `1c025e6e89e35ed520e0fff7bbca2f96559b2843` Upstream HEAD: `ddb4b7533d60ea07264c1aef7452f3f583e83062` (resolved via github) ver/26.1.2 (informational): `da005b117a464852dd8277acbc1fa82e545c864c` ## New commits ``` ddb4b75 [ci skip]refactor: rebrand to Lophine and fix checkstyle configuration ee1217a [ci skip]refactor: enhance upstream update workflow with skip logic and improved checks ``` ## Patch-dir diffstat (lophine-server/{minecraft,paper}-patches) ``` (no changes under the patch directories, or range not resolvable) ``` ## Ekaii assets to preserve when merging - [ ] all ekaii patches: minecraft-patches `0133`+ (copper-golems, boat-sleep/launcher-clusters, RegionFile-concurrent, and the ported opts `Gale-|Leaf-|SparklyPaper-|CompoundTag|VarLong`) AND paper-patches `0024`+ — cross-check `git diff --name-only <LOPHINE_UPSTREAM_SHA> HEAD -- luminol/lophine-server/*-patches` - [ ] ekaii config sources: `lophine-server/src/main/java/fr/ekaii/config/modules/**` (ekaii instance) + the `registerConfig("ekaii", …)` line in ConfigManager + `me/earthme/luminol/config/modules/optimizations/BoatLauncherSleepConfig.java` - [ ] any `cn/dreeam/leaf/util/**` support classes added by ported opts (e.g. StringCanonizingOpenHashMap) - [ ] bump `LOPHINE_UPSTREAM_SHA` after the merge
Sign in to join this conversation.
No labels
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
exo/folikaii#6
No description provided.