Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Every Compat 累积更新 #2886

Merged
merged 62 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from 51 commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
d8e9d92
update
ChuijkYahus Jan 25, 2023
039cdd9
fix
ChuijkYahus Jan 25, 2023
0727a49
update
ChuijkYahus Jan 26, 2023
c876c8a
fix
ChuijkYahus Jan 26, 2023
096b7d6
atmospheric
ChuijkYahus Jan 27, 2023
a59e9d0
Packer Policy
ChuijkYahus Jan 28, 2023
0f54407
嵌板->四格
ChuijkYahus Jan 29, 2023
0e3358f
environmental还在更新,但先整了
ChuijkYahus Jan 30, 2023
ae62350
Embur
ChuijkYahus Feb 7, 2023
ec465b9
Urushi
ChuijkYahus Mar 20, 2023
3ddd88a
Chipped
ChuijkYahus Mar 26, 2023
23fb2e1
update
ChuijkYahus Apr 2, 2023
ea87769
update
ChuijkYahus Apr 15, 2023
96f2b7c
update
ChuijkYahus Apr 19, 2023
c9911bb
update
ChuijkYahus May 21, 2023
5a59876
update
ChuijkYahus Jun 10, 2023
93bb993
BOP
ChuijkYahus Jul 16, 2023
1d211ab
update
ChuijkYahus Jul 16, 2023
8633788
update
ChuijkYahus Jul 21, 2023
9f8716a
update Woodworks
ChuijkYahus Jul 27, 2023
4ad0ffc
update
ChuijkYahus Aug 1, 2023
790d395
update 1.20
ChuijkYahus Aug 9, 2023
004925e
update Pearfection
ChuijkYahus Aug 9, 2023
64302b6
update WorkshopForHandsomeAdventurer
ChuijkYahus Aug 18, 2023
19299c1
update 一堆东西,主要是Builder's Delight
ChuijkYahus Aug 22, 2023
8b27b8b
update
ChuijkYahus Oct 2, 2023
d68132d
fix 石松->伞松
ChuijkYahus Oct 2, 2023
2b2c3a5
uodate ExNihiloSequentia
ChuijkYahus Oct 4, 2023
36b5d64
update
ChuijkYahus Oct 7, 2023
054e7a6
fix
ChuijkYahus Oct 7, 2023
7b2b480
update
ChuijkYahus Oct 9, 2023
1475887
fix AncientAether BlueSkies
ChuijkYahus Oct 11, 2023
85dca90
fix Rankine
ChuijkYahus Oct 18, 2023
857c713
hotfix Rankine
ChuijkYahus Oct 18, 2023
ec1333f
fix RUE 1.18
ChuijkYahus Oct 20, 2023
cf52a56
update
ChuijkYahus Oct 20, 2023
3a8c05b
update
ChuijkYahus Oct 30, 2023
1744e29
update
ChuijkYahus Nov 5, 2023
70a4862
update 120
ChuijkYahus May 12, 2024
c97452a
update
ChuijkYahus May 13, 2024
816e558
fix
ChuijkYahus May 13, 2024
3e5955f
Merge branch 'CFPAOrg:main' into main-everycomp
ChuijkYahus May 13, 2024
0fb436e
update:版本更新
ChuijkYahus Jun 1, 2024
c97c3d5
fix:组合初步
ChuijkYahus Jul 1, 2024
6e15a8d
hotfix
ChuijkYahus Jul 1, 2024
108785d
hotfix 2
ChuijkYahus Jul 1, 2024
739878d
update:同步
ChuijkYahus Jul 1, 2024
4a43c60
update:版本更新
ChuijkYahus Jul 6, 2024
479211c
update:累积更新,主要是BWG
ChuijkYahus Aug 7, 2024
1c11f69
fix
ChuijkYahus Aug 8, 2024
00b4ba6
fix:改了一堆
ChuijkYahus Aug 9, 2024
0234f35
fix:FAA、EnlightenedEnd
ChuijkYahus Aug 9, 2024
c5dd293
update:Slayer's Beasts(#4564)
ChuijkYahus Aug 9, 2024
569aa1b
fix:JITL
ChuijkYahus Aug 10, 2024
fea2c05
update:累积更新
ChuijkYahus Aug 14, 2024
a0b0f60
update:累积更新、Tropicraft
ChuijkYahus Aug 14, 2024
f5fb542
update:版本更新
ChuijkYahus Aug 15, 2024
fa7ae58
update:Environmental
ChuijkYahus Aug 16, 2024
30c07ea
update:版本更新
ChuijkYahus Aug 21, 2024
e544a57
update:版本更新,NatureArise新增柳木
ChuijkYahus Aug 28, 2024
467f616
fix:回退
ChuijkYahus Aug 28, 2024
5141714
fix:菇柄
ChuijkYahus Aug 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[
{
"type": "singleton",
"source": "projects/1.19/assets/every-compat/everycomp/lang/zh_cn.json",
"relativePath": "lang/zh_cn.json"
}
]
149 changes: 137 additions & 12 deletions projects/1.18/assets/every-compat/everycomp/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,35 @@
{
"itemGroup.everycomp": "Every Compat",

"block_type.twigs.table": "%s Table",

"block_type.missingwilds.fallen_log": "Fallen %s Log",

"block_type.campchair.camp_chair": "%s Camp Chair",

"block_type.another_furniture.table": "%s Table",
"block_type.another_furniture.chair": "%s Chair",
"block_type.another_furniture.shelf": "%s Shelf",
"block_type.another_furniture.shutter": "%s Shutter",
"block_type.another_furniture.planter_box": "%s Flower Box",
"block_type.another_furniture.drawer": "%s Drawer",
"block_type.another_furniture.bench": "%s Bench",

"block_type.graveyard.coffin": "%s Coffin",

"block_type.decorative_blocks.palisade": "%s Palisade",
"block_type.decorative_blocks.support": "%s Support",
"block_type.decorative_blocks.beam": "%s Beam",
"block_type.decorative_blocks.seat": "%s Seat",
"block_type.decorative_winter.snowy_palisade": "Snowy %s Palisade",

"block_type.farmersdelight.cabinet": "%s Cabinet",
"block_type.twilightforest.hollow_log": "Hollow %s Log",
"block_type.twilightforest.hollow_log_vertical": "Hollow %s Log",
"block_type.twilightforest.hollow_log_horizontal": "Hollow %s Log",
"block_type.twilightforest.hollow_log_climbable": "Hollow %s Log",
"block_type.twilightforest.banister": "%s Banister",

"block_type.quark.stripped_post": "Stripped %s Post",
"block_type.quark.post": "%s Post",
"block_type.quark.hedge": "%s Leaf Hedge",
Expand All @@ -30,11 +38,24 @@
"block_type.quark.trapped_chest": "Trapped %s Chest",
"block_type.quark.bookshelf": "%s Bookshelf",
"block_type.quark.vertical_planks": "Vertical %s Planks",

"block_type.architects_palette.railing": "%s Railing",
"block_type.architects_palette.boards": "%s Boards",

"block_type.valhelsia_structures.cut_post": "Cut %s Post",
"block_type.valhelsia_structures.post": "%s Post",

"block_type.backpacked.backpack_shelf": "%s Backpack Shelf",

"block_type.mcwbridges.rail_bridge": "%s Rail Bridge",
"block_type.mcwbridges.bridge_pier": "%s Bridge Pier",
"block_type.mcwbridges.log_bridge_middle": "%s Bridge",
"block_type.mcwbridges.log_bridge_stair": "%s Bridge Stair",
"block_type.mcwbridges.rope_bridge_stair": "Rope %s Bridge Stair",
"block_type.mcwbridges.rope_bridge": "Rope %s Bridge",
"block_type.mcwbridges.bridge_rope": "Rope %s Bridge",
"block_type.mcwbridges.wired_fence": "%s Wired Fence",

"block_type.mcwdoors.bark_glass_door": "%s Bark Glass Door",
"block_type.mcwdoors.barn_door": "%s Barn Door",
"block_type.mcwdoors.barn_glass_door": "%s Barn Glass Door",
Expand All @@ -53,23 +74,99 @@
"block_type.mcwdoors.stable_head_door": "%s Stable Horse Door",
"block_type.mcwdoors.tropical_door": "%s Tropical Door",
"block_type.mcwdoors.western_door": "%s Western Door",

"block_type.mcwfences.picket_fence": "%s Picket Fence",
"block_type.mcwfences.stockade_fence": "%s Stockade Fence",
"block_type.mcwfences.horse_fence": "%s Horse Fence",
"block_type.mcwfences.wired_fence": "%s Wired Fence",
"block_type.mcwfences.pyramid_gate": "%s Pyramid Gate",
"block_type.mcwfences.highley_gate": "%s Highley Gate",
"block_type.mcwbridges.rail_bridge": "%s Rail Bridge",
"block_type.mcwbridges.bridge_pier": "%s Bridge Pier",
"block_type.mcwbridges.log_bridge_middle": "%s Bridge",
"block_type.mcwbridges.log_bridge_stair": "%s Bridge Stair",
"block_type.mcwbridges.rope_bridge_stair": "Rope %s Bridge Stair",
"block_type.mcwbridges.rope_bridge": "Rope %s Bridge",
"block_type.mcwbridges.bridge_rope": "Rope %s Bridge",
"block_type.mcwbridges.wired_fence": "%s Wired Fence",


"block_type.mcwfurnitures.bookshelf": "%s bookshelf",
"block_type.mcwfurnitures.bookshelf_cupboard": "%s Bookshelf Cupboard",
"block_type.mcwfurnitures.stripped_bookshelf": "Stripped %s Bookshelf",
"block_type.mcwfurnitures.stripped_bookshelf_cupboard": "Stripped %s Bookshelf Cupboard",

"block_type.mcwfurnitures.chair": "%s Chair",
"block_type.mcwfurnitures.stool_chair": "%s Stool",
"block_type.mcwfurnitures.modern_chair": "%s Modern Chair",
"block_type.mcwfurnitures.striped_chair": "%s Striped Chair",
"block_type.mcwfurnitures.stripped_chair": "Stripped %s Chair",
"block_type.mcwfurnitures.stripped_stool_chair": "Stripped %s Stool",
"block_type.mcwfurnitures.stripped_modern_chair": "Stripped %s Modern Chair",
"block_type.mcwfurnitures.stripped_striped_chair": "Stripped %s Striped Chair",


"block_type.mcwfurnitures.counter": "%s Counter",
"block_type.mcwfurnitures.drawer_counter": "%s Drawer Counter",
"block_type.mcwfurnitures.cupboard_counter": "%s Cupboard Counter",
"block_type.mcwfurnitures.double_drawer_counter": "%s Double Drawer Counter",
"block_type.mcwfurnitures.stripped_counter": "Stripped %s Counter",
"block_type.mcwfurnitures.stripped_drawer_counter": "Stripped %s Drawer Counter",
"block_type.mcwfurnitures.stripped_cupboard_counter": "Stripped %s Cupboard Counter",
"block_type.mcwfurnitures.stripped_double_drawer_counter": "Stripped %s Double Drawer Counter",

"block_type.mcwfurnitures.drawer": "%s Drawer",
"block_type.mcwfurnitures.large_drawer": "%s Large Drawer",
"block_type.mcwfurnitures.triple_drawer": "%s Triple Drawer",
"block_type.mcwfurnitures.double_drawer": "%s Double Drawer",
"block_type.mcwfurnitures.bookshelf_drawer": "%s Bookshelf Drawer",
"block_type.mcwfurnitures.lower_triple_drawer": "%s Lower Triple Drawer",
"block_type.mcwfurnitures.lower_bookshelf_drawer": "%s Lower Bookshelf Drawer",
"block_type.mcwfurnitures.stripped_drawer": "Stripped %s Drawer",
"block_type.mcwfurnitures.stripped_large_drawer": "Stripped %s Large Drawer",
"block_type.mcwfurnitures.stripped_triple_drawer": "Stripped %s Triple Drawer",
"block_type.mcwfurnitures.stripped_double_drawer": "Stripped %s Double Drawer",
"block_type.mcwfurnitures.stripped_bookshelf_drawer": "Stripped %s Bookshelf Drawer",
"block_type.mcwfurnitures.stripped_lower_triple_drawer": "Stripped %s Lower Triple Drawer",
"block_type.mcwfurnitures.stripped_lower_bookshelf_drawer": "Stripped %s Lower Bookshelf Drawer",

"block_type.mcwfurnitures.desk": "%s Desk",
"block_type.mcwfurnitures.modern_desk": "%s Modern Desk",
"block_type.mcwfurnitures.covered_desk": "%s Covered Desk",
"block_type.mcwfurnitures.stripped_desk": "Stripped %s Desk",
"block_type.mcwfurnitures.stripped_modern_desk": "Stripped %s Modern Desk",
"block_type.mcwfurnitures.stripped_covered_desk": "Stripped %s Covered Desk",

"block_type.mcwfurnitures.table": "%s Table",
"block_type.mcwfurnitures.end_table": "%s End Table",
"block_type.mcwfurnitures.coffee_table": "%s Coffee Table",
"block_type.mcwfurnitures.glass_table": "%s Glass Table",
"block_type.mcwfurnitures.stripped_table": "Stripped %s Table",
"block_type.mcwfurnitures.stripped_end_table": "Stripped %s End Table",
"block_type.mcwfurnitures.stripped_coffee_table": "Stripped %s Coffee Table",
"block_type.mcwfurnitures.stripped_glass_table": "Stripped %s Glass Table",

"block_type.mcwfurnitures.wardrobe": "%s Wardrobe",
"block_type.mcwfurnitures.modern_wardrobe": "%s Modern Wardrobe",
"block_type.mcwfurnitures.double_wardrobe": "%s Double Wardrobe",
"block_type.mcwfurnitures.stripped_wardrobe": "Stripped %s Wardrobe",
"block_type.mcwfurnitures.stripped_modern_wardrobe": "Stripped %s Modern Wardrobe",
"block_type.mcwfurnitures.stripped_double_wardrobe": "Stripped %s Double Wardrobe",


"block_type.mcwlights.soul_tiki_torch": "Soul %s Tiki Torch",
"block_type.mcwlights.tiki_torch": "%s Tiki Torch",

"block_type.mcwpaths.planks_path": "%s Planks Path",

"block_type.mcwroofs.roof": "%s Roof",
"block_type.mcwroofs.top_roof": "%s Top Roof",
"block_type.mcwroofs.attic_roof": "%s Attic Roof",
"block_type.mcwroofs.lower_roof": "%s Lower Roof",
"block_type.mcwroofs.steep_roof": "%s Steep Roof",
"block_type.mcwroofs.upper_lower_roof": "%s Upper Lower Roof",
"block_type.mcwroofs.upper_steep_roof": "%s Upper Steep Roof",

"block_type.mcwroofs.planks_roof": "%s Planks Roof",
"block_type.mcwroofs.planks_top_roof": "%s Planks Top Roof",
"block_type.mcwroofs.planks_attic_roof": "%s Planks Attic Roof",
"block_type.mcwroofs.planks_lower_roof": "%s Planks Lower Roof",
"block_type.mcwroofs.planks_steep_roof": "%s Planks Steep Roof",
"block_type.mcwroofs.planks_upper_lower_roof": "%s Planks Upper Lower Roof",
"block_type.mcwroofs.planks_upper_steep_roof": "%s Planks Upper Steep Roof",

"block_type.mcwtrpdoors.bark_trapdoor": "%s Bark Trapdoor",
"block_type.mcwtrpdoors.barn_trapdoor": "%s Barn Trapdoor",
"block_type.mcwtrpdoors.barred_trapdoor": "%s Barred Trapdoor",
Expand All @@ -81,19 +178,28 @@
"block_type.mcwtrpdoors.mystic_trapdoor": "%s Mystic Trapdoor",
"block_type.mcwtrpdoors.paper_trapdoor": "%s Paper Trapdoor",
"block_type.mcwtrpdoors.tropical_trapdoor": "%s Tropical Trapdoor",

"block_type.mcwwindows.window": "%s Window",
"block_type.mcwwindows.window2": "%s Pane Window",
"block_type.mcwwindows.four_window": "%s Four Pane Window",
"block_type.mcwwindows.plank_four_window": "%s Plank Four Pane Window",
"block_type.mcwwindows.stripped_log_four_window": "Stripped %s Four Pane Window",
"block_type.mcwwindows.window_pane": "%s Window Pane",
"block_type.mcwwindows.plank_window": "%s Plank Window",
"block_type.mcwwindows.plank_window2": "%s Plank Grille Window",
"block_type.mcwwindows.window2": "%s Grille Window",
"block_type.mcwwindows.plank_window2": "%s Plank Pane Window",
"block_type.mcwwindows.stripped_log_window": "Stripped %s Window",
"block_type.mcwwindows.stripped_log_window2": "Stripped %s Grille Window",
"block_type.mcwwindows.stripped_log_window2": "Stripped %s Pane Window",
"block_type.mcwwindows.log_parapet": "%s Parapet",
"block_type.mcwwindows.plank_parapet": "%s Plank Parapet",
"block_type.mcwwindows.blinds": "%s Blinds",
"block_type.mcwwindows.shutter": "%s Shutter",
"block_type.mcwwindows.louvered_shutter": "%s Louvered Shutter",

"block_type.benched.bench": "%s Bench",

"block_type.create.window": "%s Window",
"block_type.create.window_pane": "%s Window Pane",

"block_type.cfm.window": "%s Window",
"block_type.cfm.backpack_shelf": "%s Backpack Shelf",
"block_type.cfm.bedside_cabinet": "%s Bedside Cabinet",
Expand Down Expand Up @@ -149,6 +255,7 @@
"block_type.cfm.upgraded_fence": "%s Upgraded Fence",
"block_type.cfm.upgraded_gate": "%s Upgraded Gate",
"block_type.cfm.vertical_planks": "Vertical %s Planks",

"block_type.projectbrazier.armrest_chair": "%s Armrest Chair",
"block_type.projectbrazier.bench": "%s Bench",
"block_type.projectbrazier.bottom_platform": "%s Platform",
Expand Down Expand Up @@ -179,12 +286,30 @@
"block_type.projectbrazier.top_platform_stairs": "%s Platform Stairs",
"block_type.projectbrazier.vertical_lattice": "%s Vertical Lattice",
"block_type.projectbrazier.zipline_anchor": "%s Zipline Anchor",

"block_type.storagedrawers.full_drawers_1": "%s Storage Drawers 1x1",
"block_type.storagedrawers.full_drawers_2": "%s Storage Drawers 1x2",
"block_type.storagedrawers.full_drawers_4": "%s Storage Drawers 2x2",
"block_type.storagedrawers.half_drawers_1": "%s Half Drawers 1x1",
"block_type.storagedrawers.half_drawers_2": "%s Half Drawers 1x2",
"block_type.storagedrawers.half_drawers_4": "%s Half Drawers 2x2",
"block_type.storagedrawers.trim": "%s Trim",
"wood_type.twilightforest.dark": "Darkwood"

"wood_type.twilightforest.dark": "Darkwood",

"block_type.infinitybuttons.large_button": "%s Large Button",
"block_type.infinitybuttons.plank_secret_button": "%s Plank Secret Button",

"block_type.workshop_for_handsome_adventurer.simple_table": "Crafting Table (%s)",
"block_type.workshop_for_handsome_adventurer.book_shelf_double": "Book Shelf (%s, two rows)",
"block_type.workshop_for_handsome_adventurer.book_shelf_minimal": "Book Shelf (%s, one row)",
"block_type.workshop_for_handsome_adventurer.book_shelf_open_minimal": "Book Shelf (%s, one row, open)",
"block_type.workshop_for_handsome_adventurer.book_shelf_open_double": "Book Shelf (%s, two rows, open)",
"block_type.workshop_for_handsome_adventurer.book_shelf_with_lanterns": "Book Shelf (%s, with lights)",
"block_type.workshop_for_handsome_adventurer.tool_rack_double": "Tool Rack (%s, triple)",
"block_type.workshop_for_handsome_adventurer.tool_rack_framed": "Tool Rack (%s, framed)",
"block_type.workshop_for_handsome_adventurer.tool_rack_pframed": "Tool Rack (%s, partly framed)",
"block_type.workshop_for_handsome_adventurer.tool_rack_single": "Tool Rack (%s, single)",
"block_type.workshop_for_handsome_adventurer.potion_shelf": "Potion Shelf (%s)",
"block_type.workshop_for_handsome_adventurer.workstation_placer": "Workstation (%s)"
}
Loading
Loading