Commit Graph

66 Commits

Author SHA1 Message Date
Alexander fff9268f77 Merge branch 'upstream-0.18.6.4' into 0.18.6.4-meatball 2026-08-18 13:12:03 +02:00
Alexander 5788c5a938 0.18.6.4 (reconstructed from the official server pack)
Upstream released 0.18.6.4 on CurseForge (Aug 16 2026) but never committed
it; GitHub main is still at e80fcdfd (0.18.6.3, Aug 9). Reconstructed here
the same way 0.18.5-hotfix2 was.

Source: Meatballcraft-Server-prerelease-0.18.6.4.zip (the official server
pack), NOT a played instance. An earlier attempt sourced from the local
Prism instance showed 842 changed files; almost all of that was runtime
drift from a played world. The pristine zip gives 27.

  config/, scripts/, pillar/, structures/, AlternativeConfigs/
      <- server pack (pristine)
  resources/            <- Prism instance (client-only, absent from the
                           server pack; unchanged apart from one new model)
  manifest.json, modlist.html
      <- Prism instance flame/ metadata (client pack files, version
         prerelease-0.18.6.4, 374 mods)

The server pack ships CRLF; this repo is LF. Line endings were normalised
to LF so the diff carries content only - the raw copy was 4613 files and
1.08M lines of pure CRLF churn.

Notable: upstream now ships the three AedialClientVSServer client mixin
scripts renamed .zs -> .txt (disabled), which is the same change the
hotfix2 reconstruction made independently. Git records them as R100.

Not reconstructed:
- modlist_files.txt, left at 0.18.6.3. The server pack lists 398 server
  jars; this file holds 364 client entries and its provenance is unclear,
  so writing the server list would be wrong.
- Deletions outside scripts/. The server pack omits client-only mods, so
  absence there does not imply removal from the pack. scripts/ is fully
  present server-side and was checked: the three renames above were the
  only stale files.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-08-18 13:11:39 +02:00
Alexander 1fd1ae068c Merge upstream 0.18.6.3 (e80fcdfd) into 0.18.5-hotfix2
Syncs the fork with sainagh/meatballcraft main. Pack version
prerelease-0.18.5-hotfix2 -> 0.18.6.3, mod count 367 -> 374.

Conflict resolutions (21 real conflicts, all taken from upstream after
verifying no hotfix2 content is lost):

- Runtime-generated caches (tconstruct_oredictcache.dat, ProjectE
  mapping.cfg, AE2 items.csv/VersionChecker.cfg, teamreborn
  configData.nbt, jei/worldSettings.cfg, splash.properties): upstream,
  these regenerate on first load.
- config/extendedcrafting.cfg: upstream dedupes singularity 2060, which
  duplicated 651 (divinerpg:divine_stone). ModularIceFire.zs repointed
  to :651 to match.
- ToolTips*.zs: upstream reworked the tooltip set (+2093 lines). Of the
  543 lines dropped, 542 were 0.18.5 base content upstream deliberately
  rewrote; the 1 hotfix2 line (tardis_coral) exists upstream in extended
  form.
- MythicProcessorTransfuser.zs: upstream split mythenrich* recipes into
  a new scripts/MythicProcessorEnricher.zs against the new
  mythic_processor_enricher machine. Both hotfix2-only recipes
  (mythenrich23 infinity_fragment*4, mythenrich60 ogerite ->
  primal_ogerite) are present there verbatim.
- ModularVoidBranches.zs: upstream rebalance (infinity 288->72,
  resting_actualization 50->5); base matched ours, so not our change.
- AEGating.zs: upstream supersedes the hotfix2 block, using
  cells:singularity_processor:2 and fixing a bug where our
  import_essentia_interface recipe emitted export_essentia_interface.

hotfix2 config work (fugue.cfg, forge.cfg, forge_early.cfg,
ebwizardry.cfg) verified byte-identical after the merge.

NOT synced: mods/ jars. 35 version bumps, Botania -> Botania CEu,
BiblioCraft -> BiblioCraft Reshelved, CensoredASM dropped, 6 new mods.
The server will not start on these configs until the jars are updated.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-08-18 12:19:29 +02:00
sainagh e80fcdfd55 0.18.6.3 2026-08-09 11:50:43 -05:00
Alexander 67ba30e49b 0.18.5-hotfix2 (reconstructed from live server state)
Rebuilt from /root/server/Meatballcraft-Server-prerelease-0.18.5-hotfix2
(pct 1234) since the hotfix2 release was never committed upstream —
upstream history jumps from 89cbf41 (0.18.5) to 9bbd4be (partial lore,
0.18.6 dev).

Synced config/, scripts/, pillar/, AlternativeConfigs/ to match the
server byte-for-byte (92 files: 53 changed, 36 added, 3 client-only
mixin scripts disabled via .zs -> .txt rename). Includes ~26
runtime-generated files (activity.json, tconstruct_oredictcache.dat,
forge.cfg, ...) kept for exact parity with the server.

Not synced: mods/ (untracked; hotfix2 bumped ~15 jars, see
modlist_files.txt drift), resources/ (client-only, absent on server),
manifest.json (client pack file, absent on server).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-08-04 20:31:34 +02:00
sainagh c6df59caf7 fix commit 2026-07-25 16:20:42 -05:00
sainagh 5463fe8373 0.18.6.1 2026-07-25 16:18:14 -05:00
sainagh 3533ad27ec 0.18.6 2026-07-10 16:26:02 -05:00
sainagh 9bbd4be82c partial lore 2026-06-30 13:55:17 -05:00
sainagh 89cbf41e1d 0.18.5 2026-04-10 18:28:58 -05:00
sainagh 6e24b21e79 0.18.4 2026-03-25 15:28:45 -05:00
sainagh c6137e9101 content updates 2026-02-11 18:42:38 -06:00
sainagh c6f94fb951 Merge pull request #59 from blackeyefly/typo-darkl
Typo: darkl -> dark
2026-01-14 16:01:13 -06:00
sainagh 032d39f529 0.18.3 2025-11-26 10:25:55 -06:00
sainagh 03a46a005c tooltip update and some script changes 2025-10-16 17:49:07 -05:00
sainagh 4b6eb1d443 main content changes pre 0.18.3 2025-10-08 15:37:43 -05:00
sainagh 437f80751a Merge branch 'main' of https://github.com/sainagh/meatballcraft 2025-08-01 14:14:52 -05:00
sainagh e943a34f58 Merge pull request #61 from jchung01/thaumcraft-research
Unify thaumcraft plates in research rewards
2025-08-01 14:13:25 -05:00
sainagh d00a8962fc Merge pull request #60 from alexandrehassan/typos
Small typos in questbook
2025-08-01 14:12:49 -05:00
sainagh 4e56f20a88 Merge pull request #58 from Alecsioo/patch-1
Update ModularRadiationScrubbing.zs recipe tooltips
2025-08-01 14:12:11 -05:00
sainagh a6964940b3 PRless-0.18.2 2025-08-01 14:02:02 -05:00
alexhassan 453d6f7c6e weapond 2025-07-25 17:53:40 -04:00
Alexandre Hassan 75c11936a9 bewitchment 2025-07-24 20:26:36 -04:00
Max Zhu 3a2b00b665 Typo: darkl -> dark 2025-07-23 14:48:24 +12:00
Alecsioo fa3c602c55 Update ModularRadiationScrubbing.zs recipe tooltips 2025-07-22 21:15:43 +02:00
Alexandre Hassan 7dd9f708e8 passive_extended_crafting typo 2025-07-18 14:46:33 -04:00
Max Zhu 2bd2797f0b Fix typos: teh -> the 2025-07-17 09:43:32 +12:00
jchung01 0da8ecd252 Unify thaumcraft plates in research rewards 2025-07-08 20:52:39 -07:00
sainagh 393809f13f update 0.18.1 2025-06-18 18:26:57 -07:00
sainagh e40d3983b9 Merge pull request #41 from jchung01/xp-bath-fix
Improve XP bath and fix related bugs
2025-05-28 09:53:04 -07:00
jchung01 c7a7595150 Add missing haumea portal recipe 2025-05-24 12:43:21 -07:00
jchung01 e8aa75b05b Unify thaumcraft plates 2025-05-22 23:39:05 -07:00
jchung01 be1d89c4ef Rewrite XP bath
- Now works in any dimension
- Rework configurator
- Cleanup code
- Add localization
2025-05-22 13:20:16 -07:00
jchung01 4d04e54d10 Refactor shared code for portals 2025-05-20 22:49:46 -07:00
jchung01 e51f3aa8ba Replace crafting reqs for Thaumic Energistics 2025-05-17 19:41:50 -07:00
jchung01 e38c064cb1 Replace crafting reqs for TAR plates
- Now a consume requirement instead of crafting requirement
- Removes crafting recipes for the plates
2025-05-16 23:15:46 -07:00
jchung01 768a618c1b Restore recipes in certain research pages
- Also fix kami recipes
2025-05-16 16:23:53 -07:00
sainagh 81f239c21b 0.18.0
0.18.0, hotfix4 update
2025-05-13 16:10:52 -07:00
sainagh feadcf829f pre-0.18 2025-04-26 10:44:04 -07:00
sainagh 792ec88708 canon ending dev build 2025-03-04 16:51:19 -08:00
sainagh aad7f70f2f 0.17 official 2025-01-25 10:22:23 -08:00
sainagh caeb0bd183 0.17-pre 2025-01-15 16:18:41 -08:00
sainagh f7532d1672 0.16.5-hotfix2 2024-10-23 15:17:54 -07:00
sainagh 9a9983c59a 0.16.5-hotfix1 2024-10-22 15:32:10 -07:00
sainagh 23e83e21f4 0.16-hotfix4 2024-08-20 14:53:38 -07:00
sainagh 0a09116c6e 0.16 2024-08-18 18:25:41 -07:00
sainagh 370d7ad5f0 hotfix wooden gears 2024-05-25 10:14:22 -07:00
sainagh 9bccd068fd 0.15.2 2024-05-25 09:31:20 -07:00
sainagh 7152251bdf general updates (not including modlist) 2024-05-03 10:04:06 -07:00
sainagh e05b4de98e 0.15 hotfix 1 2024-02-06 14:56:51 -08:00