feature/bike-update #12
No reviewers
Labels
No labels
No milestone
No project
No assignees
5 participants
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
pokebedrock/pokebedrock-res!12
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "feature/bike-update"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
2bc9963c30835fb9addcResource-pack review of head
835fb9addcb0(companion to beh#724).Bike client entity, geos, controllers, item textures, and wrap/costume Molang scales look coherent. Human APPROVE 2766 is on stale
c6dd7d4only.Blocker:
texts/pt_BR.langis a ~3200-line rewrite (3243/3199), not bike keys. Do not merge a locale dump with the feature. Split or revert pt_BR to bike-only additions like en_US (44/0).Also drop the unrelated
desktop.inideletions from 3d pokemon folders / candies — cleanup, not bike-update.Electric kind correctly falls back to the normal geo/texture; wrap bones are scale-toggled in
bike_cosmetics.animation.json. Those parts are fine.Unrelated Windows leftover cleanup. Fine as its own commit, not on the bike feature branch. Please drop these
desktop.inideletes from this PR.@ -1,38 +1,40 @@pack.name=§lPokeBedrock v2.20.5 RESThis locale is a wholesale rewrite (~3200 lines), not the bike-key add that en_US/es_ES have. Revert the churn and add only the bike/wrap/decoration keys. A full pt_BR re-encode does not belong on feature/bike-update.
835fb9addc3e3abf120aRe-review of head
3e3abf120a13(follow-up to REQUEST_CHANGES on835fb9addcb0).Cleared:
texts/pt_BR.langis now bike-scoped (45/0), matchingen_US/es_ES. Encoding/parity tip commit addresses the prior locale dump blocker.Client entity, render arrays (electric→normal geo/skin), controllers, and wrap/costume Molang scales still look coherent.
Still open — scope: unrelated
desktop.inideletions remain (manysubpacks/3d/textures/entity/pokemon/*/desktop.iniplustextures/items/candies/desktop.ini). Drop those from this branch (or a separate cleanup PR). Do not merge bike-update with drive-by Windows junk cleanup.Human APPROVE 2766 remains on stale
c6dd7d4only.Still unrelated to bike-update — drop this
desktop.inideletion (and the other pokemon/candies ones) from the PR.3e3abf120a2fb3019312@ -429,6 +429,9 @@"pokeb:yago_berry_plant": {"sound": "grass"},"pokeb:findable_block": {why is this in this pr?
@ -0,0 +1,250 @@{why is this in this pr
@ -37,6 +39,9 @@ item.pokeb:sword_of_justice=Meč spravedlnosti## Valentines Event Itemsitem.pokeb:box_of_chocolate=Krabička čokolády## Findable BlocksWhy are all these findable block things in here? Prob needs a rebase
Remove all the
desktop.inifiles3790d025508fbb576493Re-review of head
fa0fd364281689b1559f1b4b0bf397ce4a9de74d(merge main + pt_BR lang-sync reorder).Cleared since REQUEST_CHANGES on
3e3abf120a13:desktop.inideletions are gone from the diff.blocks.json/ present.geo dirt (on stale3790d025) is gone after the rebase.texts/pt_BR.langstays bike-scoped and key-order-matched toen_US/es_ES(44/44; tip commit is the sync reorder).Client entity, render arrays (electric→normal geo/skin), controllers, wrap/costume/decoration Molang scales, and item_texture↔
textures/items/bikes/*still look coherent. Bike-shop geo slim-down looks intentional for the feature.CI on this tip is still pending (
ci.yml/model-preview). Human APPROVE 2766 remains on stalec6dd7d4only.Policy: do not merge
pokebedrock-resindependently — keep with companion beh#724 (65815a8b).Re-review of head
fa0fd3642816(follow-up to REQUEST_CHANGES on3e3abf120a13/ nathan on3790d025).Cleared
desktop.inideletions are gone from the tip vsmain(nathan + prior bot blocker).blocks.json/ present geo noise from nathan's review is not in this tip.texts/pt_BR.langstays bike-scoped (+45/0), matchingen_US/es_ES.Blocker — dirty locales:
texts/cs_CZ.lang,de_DE.lang,ru_RU.lang, andzh_CN.langstill rewrite four non-bike strings and mojibake§→┬ºoncommands.serverDrop.error.spawnFailedandcommon.reward.error.chunkUnloadDrop. Also overwrites translatedmodels.showdown.ohko.hitandforms.home.prompt.confirmSetLocationwith English. Revert those four keys tomainin each file; keep only the bike (+ wraps/events) additions likeen_US.CI on this tip was still pending at review time — not merge-ready until green + locales cleaned. Human APPROVE 2766 remains on stale
c6dd7d4only.Blocker: this is not a bike key.
§cwas mojibaked to┬ºc. Same class of damage hitscommon.reward.error.chunkUnloadDrop, andmodels.showdown.ohko.hit/forms.home.prompt.confirmSetLocationget overwritten with English. Revert these four non-bike lines tomain; keep only bike additions.Same locale blocker as
cs_CZ: mojibake on§plus unrelated rewrites (ohko.hit,chunkUnloadDrop,confirmSetLocation). Bike-only adds; restore these lines frommain.Same locale blocker: encoding corruption (
§c/ CP1251-looking garbage) and non-bike English overwrites. Revert the four dirty keys tomain.Same locale blocker: mojibake + unrelated English overwrites on non-bike strings. Revert those keys to
main; leave bike keys only.Re-review of head
e3b2e97749f706993010e693bf35c6f52821190d(push: Point model preview at the Forgejo copy of the action).Push delta — OK:
.github/workflows/model-preview.ymlretargetssmell-of-curry/mc-model-preview@latest→ pinned Forgejohttps://git.pokebedrock.com/pokebedrock/mc-model-preview@b10a8ffc…. Correct for this host; does not clear prior blockers.Still open — dirty locales (same as REQUEST_CHANGES#2943 on
fa0fd364):texts/cs_CZ.lang,de_DE.lang,ru_RU.lang,zh_CN.langstill rewrite four non-bike strings:§→┬ºoncommands.serverDrop.error.spawnFailedandcommon.reward.error.chunkUnloadDropmodels.showdown.ohko.hitandforms.home.prompt.confirmSetLocationRevert those four keys to
mainin each file; keep only the bike (+ wraps/events) additions likeen_US/es_ES/pt_BR.Client/entity/render stack unchanged by this tip. Policy: do not merge res alone — companion beh#724 (
65815a8b).Blocker (unchanged since #2943): mojibake
§→┬ºon this key (andcommon.reward.error.chunkUnloadDrop). Also English-overwritesmodels.showdown.ohko.hit/forms.home.prompt.confirmSetLocation. Revert these four non-bike keys tomain; keep bike additions only.Same locale blocker as cs_CZ: mojibake on
spawnFailed/chunkUnloadDropplus English overwrite ofohko.hit/confirmSetLocation. Revert those four keys tomain.Same locale blocker: mojibake + double-encoded Cyrillic on non-bike keys; English overwrite on
ohko.hit/confirmSetLocation. Revert those four tomain.Same locale blocker: mojibake / garbled CJK on non-bike keys; English overwrite on
ohko.hit/confirmSetLocation. Revert those four tomain.Minecraft Model Preview (
e3b2e97)Model Changes
Re-review of head
e3b2e97749f706993010e693bf35c6f52821190d(tip after REQUEST_CHANGES#2943 @fa0fd3642816).Tip delta: mainly
Point model preview at the Forgejo copy of the action.— not a locale fix. Merge-main / pt_BR reorder history unchanged for the dirty keys.Still cleared (unchanged vs #2943)
desktop.iniabsent from tip vsmain.en_US/es_ES/pt_BRstay bike-scoped (+45/0), key order matched.pokeb:bike, electric→normal controller, variant geos/textures), controllers, item_texture↔textures/items/bikes/*, wrap/costume Molang — no new material issues on spot-check. Companion stack: beh#724 + data#8.Blocker — #2943 locales NOT cleared:
texts/cs_CZ.lang,de_DE.lang,ru_RU.lang,zh_CN.langstill +49/−4 vs main. Same four non-bike rewrites: mojibake§→┬ºoncommands.serverDrop.error.spawnFailedandcommon.reward.error.chunkUnloadDrop;models.showdown.ohko.hitandforms.home.prompt.confirmSetLocationstill overwritten with English. Revert those four keys tomainin each file; keep only bike (+ wraps/events) additions likeen_US.CI @ tip:
CI / build-and-test (20.x)success;Model Preview / model-previewpending/running; combined pending.Policy: do not merge
pokebedrock-resalone — keep with companion beh#724. Human APPROVE 2766 remains on stalec6dd7d4only.@ -34,6 +34,8 @@ pokeb:itemGroup.name.tradeMachineParts=Díly výměnného strojepokeb:itemGroup.name.fossilMachineParts=Díly fosilního strojeStill open from REQUEST_CHANGES#2943: not a bike key.
§c→┬ºcmojibake. Same damage oncommon.reward.error.chunkUnloadDrop;models.showdown.ohko.hit/forms.home.prompt.confirmSetLocationstill English overwrites. Revert these four lines tomain; keep bike-only adds (+45 like en_US).@ -34,6 +34,8 @@ pokeb:itemGroup.name.tradeMachineParts=Handelsmaschinenteilepokeb:itemGroup.name.fossilMachineParts=Fossil-MaschinenteileStill open from #2943: mojibake on
§plus unrelated rewrites (ohko.hit,chunkUnloadDrop,confirmSetLocation). Tip did not fix locales. Restore these four keys frommain.@ -34,6 +34,8 @@ pokeb:itemGroup.name.tradeMachineParts=Детали машины обменаpokeb:itemGroup.name.fossilMachineParts=Детали машины ископаемыхStill open from #2943: encoding corruption (
┬ºc/ garbled Cyrillic) and non-bike English overwrites. Revert the four dirty keys tomain.@ -34,6 +34,8 @@ pokeb:itemGroup.name.tradeMachineParts=交换机部件pokeb:itemGroup.name.fossilMachineParts=化石机部件Still open from #2943: mojibake + unrelated English overwrites on non-bike strings. Revert those keys to
main; leave bike keys only.e3b2e97749bd7f04c142Re-review of head
bd7f04c1421c(push: speed boost item, Floating Ring Wheel rename, language keys).Push delta — OK:
textures/items/bikes/speed_boost.png+item_texture.jsonspeed_boostkey +item.pokeb:speed_boostlang key added in all 7 locales;item.pokeb:floating_ring=Floating Ring Wheelconsistent across locales. Everyitem_texture.jsonbike entry has a matchingtextures/items/bikes/*.pngin the diff.Regression —
desktop.inideletions are back. This commit deletes 23desktop.inifiles (22 undersubpacks/3d/textures/entity/pokemon/*/+textures/items/candies/desktop.ini). That blocker was cleared onfa0fd364; drop those deletions from this branch again (separate cleanup PR if you want them gone).Still open — dirty locales (same as #2943 / #2968):
cs_CZ,de_DE,ru_RU,zh_CNstill +54/−4 vs main. Same four non-bike rewrites:§→┬º(plus mangled UTF-8 body) oncommands.serverDrop.error.spawnFailedandcommon.reward.error.chunkUnloadDropmodels.showdown.ohko.hitandforms.home.prompt.confirmSetLocationoverwritten with EnglishRevert those four keys to
mainin each file; keep only the bike/wrap/events additions likeen_US/es_ES/pt_BR(+50/0).Client entity, controllers, geos, and wrap/costume Molang unchanged by this tip. Policy: do not merge
pokebedrock-resalone — companion beh#724 + data#8. Human APPROVE 2766 remains on stalec6dd7d4only.@ -3852,3 +3868,3 @@commands.serverDrop.broadcast.shopUrl=§ehttps://pokebedrock.com/shopcommands.serverDrop.error.boosterFailed=§cNepodařilo se aktivovat urychlovač poklesu serveru: %scommands.serverDrop.error.spawnFailed=§cServer drop spawn selhal (%1)%2commands.serverDrop.error.spawnFailed=┬ºcServer drop spawn selhal (%1)%2Mojibake:
§became┬ºand the Czech text is mangled. Revert this line tomain. Same forcommon.reward.error.chunkUnloadDrop(L4638);models.showdown.ohko.hit(L4574) andforms.home.prompt.confirmSetLocation(L10635) overwrite the translation with English — revert both too.@ -3852,3 +3868,3 @@commands.serverDrop.broadcast.shopUrl=§ehttps://pokebedrock.com/shopcommands.serverDrop.error.boosterFailed=§cFehler beim Aktivieren des Server-Drop-Boosters: %scommands.serverDrop.error.spawnFailed=§cServer-Drop-Spawn fehlgeschlagen (%1)%2commands.serverDrop.error.spawnFailed=┬ºcServer-Drop-Spawn fehlgeschlagen (%1)%2Same four non-bike rewrites as cs_CZ (L3870 / L4574 / L4638 / L10635): mojibake
┬º+ English overwrites. Revert tomain.@ -3852,3 +3868,3 @@commands.serverDrop.broadcast.shopUrl=§ehttps://pokebedrock.com/shopcommands.serverDrop.error.boosterFailed=§cНе удалось activate сервер-drop booster: %scommands.serverDrop.error.spawnFailed=§cНе удалось заспавнить server drop (%1)%2commands.serverDrop.error.spawnFailed=┬ºc╨¥╨╡ ╤â╨┤╨░╨╗╨╛╤ü╤î ╨╖╨░╤ü╨┐╨░╨▓╨╜╨╕╤é╤î server drop (%1)%2Same four non-bike rewrites (L3870 / L4574 / L4638 / L10635): Cyrillic is mangled into box-drawing mojibake here. Revert to
main.@ -3852,3 +3868,3 @@commands.serverDrop.broadcast.shopUrl=§ehttps://pokebedrock.com/shopcommands.serverDrop.error.boosterFailed=§c激活 server-drop 加成失败：%scommands.serverDrop.error.spawnFailed=§c服务器掉落生成失败（%1）%2commands.serverDrop.error.spawnFailed=┬ºcµ£ìσèíσÖ¿µÄëΦÉ╜τöƒµêÉσñ▒Φ┤Ñ∩╝ê%1∩╝ë%2Same four non-bike rewrites (L3870 / L4574 / L4638 / L10635): mojibake + English overwrites. Revert to
main.Re-review of head
bd7f04c1(new commit: Bike update: speed boost item, Floating Ring Wheel rename, language keys).Push delta — OK
speed_boostitem:textures/items/bikes/speed_boost.png+item_texture.jsonkey +item.pokeb:speed_boostlang key across all 7 locales — coherent.item.pokeb:floating_ringrenamed to "Floating Ring Wheel" consistently.en_US/es_ES/pt_BR).Blocker — regression:
desktop.inideletions are back. This commit removes 23desktop.inifiles (22 undersubpacks/3d/textures/entity/pokemon/*/+textures/items/candies/desktop.ini). That was cleared as of #2943 (606845e6restored them). Unrelated to the bike feature — drop those deletions from this PR; if they should go, do it in a separate cleanup PR.Still open (no change, see #2943 / #2968 — not repeating inline):
cs_CZ/de_DE/ru_RU/zh_CNstill carry the four non-bike rewrites (mojibake§→┬ºonspawnFailed/chunkUnloadDrop, English overwrite ofohko.hit/confirmSetLocation).CI @ tip: red.
CI / build-and-test (20.x)(run 364) andModel Preview / model-preview(run 365) both failed within ~20s; previous tip and recentmainruns were green. Please check the run logs — not merge-ready until green.Policy: do not merge
pokebedrock-resalone — keep with companion beh#724. Human APPROVE 2766 is stale (c6dd7d4).@ -1,8 +0,0 @@[LocalizedFileNames]Regression: this commit deletes
desktop.iniagain (here + 22 undersubpacks/3d/textures/entity/pokemon/*/). Previously restored in606845e6and cleared in #2943. Not bike scope — restore these frommain.bd7f04c142922aa60526Re-review of head
922aa605(amend/force-push of Bike update: speed boost item, Floating Ring Wheel rename, language keys, now parented one3b2e977).Cleared since #3049 / #3050 on
bd7f04c1desktop.iniregression is gone: the tip commit no longer deletes anydesktop.ini, and none appear in the PR diff vsmain.textures/items/bikes/speed_boost.png+item_texture.jsonspeed_boostkey +item.pokeb:speed_boostin all 7 locales;item.pokeb:floating_ring=Floating Ring Wheelconsistent.en_US/es_ES/pt_BRstay bike-scoped (+50/0).Blocker — dirty locales still open (same as #2943 / #2968, not repeating inline):
cs_CZ,de_DE,ru_RU,zh_CNare still +54/−4 vs main. Same four non-bike rewrites:§→┬º(plus mangled UTF-8 body in cs_CZ) oncommands.serverDrop.error.spawnFailedandcommon.reward.error.chunkUnloadDropmodels.showdown.ohko.hitandforms.home.prompt.confirmSetLocationoverwritten with EnglishRevert those four keys to
mainin each of the four files; keep only the bike/wrap/events additions.CI @ tip:
CI / build-and-test (20.x)green (run 366);Model Preview / model-preview(run 367) still pending. The red runs 364/365 were on the supersededbd7f04c1.Policy: do not merge
pokebedrock-resalone — keep with companion beh#724 + data#8. Human APPROVE 2766 is stale (c6dd7d4).Minecraft Model Preview (
922aa60)Model Changes
Minecraft Model Preview (
1d03c8c)Model Changes
Re-review of head
182d8cd3(two new commits on top of922aa605:1d03c8c5Bike: add boost no-room message and182d8cd3Bike: shears reset messages).New delta: OK
events.bike.boostNoRoom,events.bike.alreadyReset,events.bike.confirmReset,events.bike.resetadded to all 7 locales at the same positions, so the lang sync order holds. Colour codes match their neighbours (§esoft warning,§asuccess, prompt uncoloured likeconfirmReplace).Blocker still open (same as #2943 / #2968 / #3051, not repeating inline):
cs_CZ,de_DE,ru_RU,zh_CNare still +58/−4 vsmain. The same four non-bike keys are rewritten:commands.serverDrop.error.spawnFailedandcommon.reward.error.chunkUnloadDrop(mojibake§→┬º), andmodels.showdown.ohko.hitandforms.home.prompt.confirmSetLocation(translation overwritten with English). Revert those four keys tomainin each of the four files and keep only the bike additions.CI @ tip:
CI / build-and-test (20.x)green;Model Preview / model-previewstill pending at review time.Policy: keep with companions beh#724 + data#8; don't merge
pokebedrock-resalone. Human APPROVE 2766 is stale (c6dd7d4).Minecraft Model Preview (
182d8cd)Model Changes
Re-review of head
25f01827(one new commit on top of182d8cd3: Restore translated values for four keys from main).Blocker from #2943 / #2968 / #3051 / #3089: cleared.
cs_CZ,de_DE,ru_RU,zh_CNnow differ frommainonly by the bike additions.commands.serverDrop.error.spawnFailed,common.reward.error.chunkUnloadDrop,models.showdown.ohko.hitandforms.home.prompt.confirmSetLocationmatchmainagain, and there's no§mojibake left in the PR diff.pack.nameshowsv2.22.5on the branch vsv3.0.0onmain, but the PR doesn't touch that line (branch is just behind), so the merge keepsmain's value.No new desk blockers on this head. Non-English locales carry English strings for the new bike items/wraps; fine as a placeholder, translate later if wanted.
CI @ tip:
CI / build-and-test (20.x)green;Model Preview / model-previewpending at review time.Policy: keep with companions beh#724 + data#8 (data#8 still has REQUEST_CHANGES 3143 open); don't merge
pokebedrock-resalone. Human APPROVE 2766 is stale (c6dd7d4), so this needs a fresh human approval.Minecraft Model Preview (
25f0182)Model Changes