Skip to content

Commit

Permalink
Merge branch 'teaconmc:dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
LocusAzzurro authored Dec 26, 2024
2 parents 248da47 + 41be418 commit 3c814ff
Show file tree
Hide file tree
Showing 4 changed files with 153 additions and 1 deletion.
Binary file modified jiachen/assets/sign_up/textures/gui/map.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
76 changes: 76 additions & 0 deletions jiachen/assets/teacon/lang/zh_cn.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{
"shard_pack.scattered_shards.name": "散碎集卡",
"shard_pack.friendship_bracelet.name": "友谊徽章",
"shard_pack.ashihara.name": "苇原",
"shard_pack.umapyoi.name": "马儿蹦跳",
"shard_pack.mystia_izakaya.name": "东方夜雀食堂",
"shard_pack.worldcomment.name": "随处随笔 WorldComment",
"shard_pack.crystaldream.name": "CrystalDream",
"shard_pack.nestle.name": "贴贴",
"shard_pack.crockpot.name": "Crock Pot",
"shard_pack.real_peaceful_mode.name": "真正的和平模式",
"shard_pack.ding.name": "打铁匠人(Ding Mod)",
"shard_pack.caupona.name": "分茶",
"shard_pack.convivium.name": "会饮",
"shard_pack.madparticle.name": "MadParticle",
"shard_pack.guide_me_to.name": "Guide Me To",
"shard_pack.everyxhotpot.name": "EveryXHotpot一起火锅",
"shard_pack.glimmeringtales.name": "微光纪事(GlimmeringTales)",
"shard_pack.cuisinedelight.name": "料理乐事(Cuisine-Delight)",
"shard_pack.randomsonnature.name": "随想自然",
"shard_pack.industrybase.name": "工业基石",
"shard_pack.melodymagic.name": "旋律魔法",
"shard_pack.hyphacraft.name": "菌丝工艺(HyphaCraft)",
"shard_pack.mtr.name": "NeoMTR 纸板箱特色我的世界铁路",
"shard_pack.celebrations.name": "欢庆",
"shard_pack.bsf.name": "更好的打雪仗3",
"shard_pack.skullcraft.name": "头颅工艺",
"shard_pack.drglaserpointer.name": "深岩银河激光指示器",
"shard_pack.bchat.name": "弹幕聊天",
"shard_pack.the_elixir.name": "不死灵药",
"shard_pack.mine_team.name": "Mine Team",
"shard_pack.assorted_armaments.name": "百般武艺",
"shard_pack.bcs_expedition_world.name": "BC的远征物语",
"shard_pack.everyxdance.name": "一起跳舞!",
"shard_pack.staff_of_the_king_orange.name": "橙王的权杖",
"shard_pack.whispergrove.name": "浅草轻语 WhisperGrove",
"shard_pack.natural_transmute.name": "自然通路",
"shard_pack.candycraftce.name": "糖果世界社区版",
"shard_pack.eclipticseasons.name": "节气",
"shard_pack.inkraft.name": "墨迹工艺",
"shard_pack.grass_craft.name": "草工艺",
"shard_pack.modulargolems.name": "傀儡装配(Modular Golems)",
"shard_pack.ferment.name": "酵化",
"shard_pack.cc_mb.name": "纸带八音盒",
"shard_pack.nch.name": "星云纪事",
"shard_pack.kitchenkarrot.name": "胡萝卜厨房",
"shard_pack.mystias_izakaya.name": "夜雀乐事Mystias Izakaya",
"shard_pack.furnitureplan.name": "Furniture Plan",
"shard_pack.oneblock.name": "更好的单方块",
"shard_pack.cleanenergy.name": "清洁能源",
"shard_pack.betterparty.name": "更好的派对",
"shard_pack.thatskyinteractions.name": "ThatSkyInteractions",
"shard_pack.hugme.name": "抱我!(HugMe!)",
"shard_pack.locusazzurro_icaruswings.name": "伊卡洛斯之翼",
"shard_pack.teastory.name": "茶风·纪事:追叙",
"shard_pack.anomaly_delight.name": "异常乐事",
"shard_pack.freecameraapi.name": "自由相机API",
"shard_pack.touhou_little_maid.name": "车万女仆",
"shard_pack.theaurorian.name": "极光幽境2",
"shard_pack.lavafishing.name": "岩浆钓鱼",
"shard_pack.netmusic.name": "网络音乐机",
"shard_pack.double_the_happiness.name": "双倍快乐!",
"shard_pack.lovemod.name": "LoveMod:Furina",
"shard_pack.yuushya.name": "方块小镇",
"shard_pack.dabaosword.name": "大宝刀",
"shard_pack.minopp.name": "Mino++",
"shard_pack.cuisine.name": "料理工艺:传承",
"shard_pack.yuushya_modelling.name": "方块建模",
"shard_pack.leashedplayer.name": "可拴的玩家",
"shard_pack.terrain_tectonic_trilithic.name": "自然矿物/TerrainTectonicTrilithic",
"shard_pack.retrorain.name": "洄时之雨",
"shard_pack.tracen_delight.name": "特雷森乐事",
"shard_pack.fluxnetworks.name": "通量网络",
"shard_pack.anvilcraft.name": "铁砧工艺:重力科技",
"shard_pack.wenyan_nature.name": "吾有一术"
}
76 changes: 76 additions & 0 deletions jiachen/assets/teacon/lang/zh_tw.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{
"shard_pack.scattered_shards.name": "散碎集卡",
"shard_pack.friendship_bracelet.name": "友誼徽章",
"shard_pack.ashihara.name": "葦原",
"shard_pack.umapyoi.name": "馬兒蹦跳",
"shard_pack.mystia_izakaya.name": "東方夜雀食堂",
"shard_pack.worldcomment.name": "隨處隨筆 WorldComment",
"shard_pack.crystaldream.name": "CrystalDream",
"shard_pack.nestle.name": "貼貼",
"shard_pack.crockpot.name": "Crock Pot",
"shard_pack.real_peaceful_mode.name": "真正的和平模式",
"shard_pack.ding.name": "打鐵匠人(Ding Mod)",
"shard_pack.caupona.name": "分茶",
"shard_pack.convivium.name": "會飲",
"shard_pack.madparticle.name": "MadParticle",
"shard_pack.guide_me_to.name": "Guide Me To",
"shard_pack.everyxhotpot.name": "EveryXHotpot一起火鍋",
"shard_pack.glimmeringtales.name": "微光紀事(GlimmeringTales)",
"shard_pack.cuisinedelight.name": "料理樂事(Cuisine-Delight)",
"shard_pack.randomsonnature.name": "隨想自然",
"shard_pack.industrybase.name": "工業基石",
"shard_pack.melodymagic.name": "旋律魔法",
"shard_pack.hyphacraft.name": "菌絲工藝(HyphaCraft)",
"shard_pack.mtr.name": "NeoMTR 紙板箱特色我的世界鐵路",
"shard_pack.celebrations.name": "歡慶",
"shard_pack.bsf.name": "更好的打雪仗3",
"shard_pack.skullcraft.name": "頭顱工藝",
"shard_pack.drglaserpointer.name": "深岩銀河激光指示器",
"shard_pack.bchat.name": "彈幕聊天",
"shard_pack.the_elixir.name": "不死靈藥",
"shard_pack.mine_team.name": "Mine Team",
"shard_pack.assorted_armaments.name": "百般武藝",
"shard_pack.bcs_expedition_world.name": "BC的遠征物語",
"shard_pack.everyxdance.name": "一起跳舞!",
"shard_pack.staff_of_the_king_orange.name": "橙王的權杖",
"shard_pack.whispergrove.name": "淺草輕語 WhisperGrove",
"shard_pack.natural_transmute.name": "自然通路",
"shard_pack.candycraftce.name": "糖果世界社區版",
"shard_pack.eclipticseasons.name": "節氣",
"shard_pack.inkraft.name": "墨跡工藝",
"shard_pack.grass_craft.name": "草工藝",
"shard_pack.modulargolems.name": "傀儡裝配(Modular Golems)",
"shard_pack.ferment.name": "酵化",
"shard_pack.cc_mb.name": "紙帶八音盒",
"shard_pack.nch.name": "星雲紀事",
"shard_pack.kitchenkarrot.name": "胡蘿蔔廚房",
"shard_pack.mystias_izakaya.name": "夜雀樂事Mystias Izakaya",
"shard_pack.furnitureplan.name": "Furniture Plan",
"shard_pack.oneblock.name": "更好的單方塊",
"shard_pack.cleanenergy.name": "清潔能源",
"shard_pack.betterparty.name": "更好的派對",
"shard_pack.thatskyinteractions.name": "ThatSkyInteractions",
"shard_pack.hugme.name": "抱我!(HugMe!)",
"shard_pack.locusazzurro_icaruswings.name": "伊卡洛斯之翼",
"shard_pack.teastory.name": "茶風·紀事:追敘",
"shard_pack.anomaly_delight.name": "異常樂事",
"shard_pack.freecameraapi.name": "自由相機API",
"shard_pack.touhou_little_maid.name": "車万女僕",
"shard_pack.theaurorian.name": "極光幽境2",
"shard_pack.lavafishing.name": "岩漿釣魚",
"shard_pack.netmusic.name": "網絡音樂機",
"shard_pack.double_the_happiness.name": "雙倍快樂!",
"shard_pack.lovemod.name": "LoveMod:Furina",
"shard_pack.yuushya.name": "方塊小鎮",
"shard_pack.dabaosword.name": "大寶刀",
"shard_pack.minopp.name": "Mino++",
"shard_pack.cuisine.name": "料理工藝:傳承",
"shard_pack.yuushya_modelling.name": "方塊建模",
"shard_pack.leashedplayer.name": "可拴的玩家",
"shard_pack.terrain_tectonic_trilithic.name": "自然礦物/TerrainTectonicTrilithic",
"shard_pack.retrorain.name": "洄時之雨",
"shard_pack.tracen_delight.name": "特雷森樂事",
"shard_pack.fluxnetworks.name": "通量網絡",
"shard_pack.anvilcraft.name": "鐵砧工藝:重力科技",
"shard_pack.wenyan_nature.name": "吾有一術"
}
2 changes: 1 addition & 1 deletion jiachen/config/SignMeUp/Map.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"worldSize": 2048,
"worldSize": 2240,
"centerWorldX": 0,
"centerWorldZ": 0
}

0 comments on commit 3c814ff

Please sign in to comment.