Merge branch 'main' into main

lang/de.json

@@ -457,18 +457,14 @@
 "greek_fire":"Griechisches_Feuer",
 "fireball":"Feuerball",
 "rocket":"Rakete",
-"sticky_bomb":"Klebrige_bombe",
 "cold_bomb":"Kalte_bombe",
 "hot_bomb":"Heiße_bombe",
-"electro_bomb":"Electrobombe",
-"water_bomb":"Wasserbombe",
 "antimatter_bomb":"Antimaterie bombe",
 "party_popper":"Party-Popper",
 "flashbang":"LichtKnall",
 "flash":"Lichtschnelle",
 "smoke_grenade":"Rauchgranate",
 "landmine":"Landmine",
-"cluster_bomb":"Streubomben",
 "armageddon":"Armageddon",
 "tesla_coil":"Tesla-Spule",
 "light_bulb":"Glühbirne",

lang/es.json

@@ -457,18 +457,14 @@
 "greek_fire":"",
 "fireball":"",
 "rocket":"",
-"sticky_bomb":"",
 "cold_bomb":"",
 "hot_bomb":"",
-"electro_bomb":"",
-"water_bomb":"",
 "antimatter_bomb":"",
 "party_popper":"",
 "flashbang":"",
 "flash":"",
 "smoke_grenade":"",
 "landmine":"",
-"cluster_bomb":"",
 "armageddon":"",
 "tesla_coil":"",
 "light_bulb":"",

lang/fr.json

@@ -457,18 +457,14 @@
 "greek_fire":"Feu grec",
 "fireball":"Boule de feu",
 "rocket":"Fusée",
-"sticky_bomb":"Bombe collante",
 "cold_bomb":"Bombe froide",
 "hot_bomb":"Bombe chaude",
-"electro_bomb":"Bombe électro",
-"water_bomb":"Bombe à eau",
 "antimatter_bomb":"Bombe antimatière",
 "party_popper":"Bombe de table",
 "flashbang":"Flashbang",
 "flash":"Éclair",
 "smoke_grenade":"Grenade fumigène",
 "landmine":"Mine terrestre",
-"cluster_bomb":"Bombe à fragmentation",
 "armageddon":"Armageddon",
 "tesla_coil":"Bobine Tesla",
 "light_bulb":"Ampoule",

lang/hu.json

@@ -457,18 +457,14 @@
 "greek_fire":"görögtűz",
 "fireball":"tűzgolyó",
 "rocket":"rakéta",
-"sticky_bomb":"ragacsos_bomba",
 "cold_bomb":"hideg_bomba",
 "hot_bomb":"forró_bomba",
-"electro_bomb":"elektromos_bomba",
-"water_bomb":"vízi_bomba",
 "antimatter_bomb":"antianyag_bomba",
 "party_popper":"konfetti_durrancs",
 "flashbang":"villanógránát",
 "flash":"villanás",
 "smoke_grenade":"füstgránát",
 "landmine":"taposóakna",
-"cluster_bomb":"kazettás_bomba",
 "armageddon":"armageddon",
 "tesla_coil":"teszlatekercs",
 "light_bulb":"villanykörte",

lang/pl.json

@@ -1,6 +1,6 @@
 {
 "#lang.name": "Polski",
-"#lang.credit": "ggod, _ilikepizza_",
+"#lang.credit": "ggod, _ilikepizza_, ChoinkaXD",
 "land":"teren",
 "liquids":"płyny",
 "life":"życie",
@@ -20,7 +20,7 @@
 "pick":"wybierz",
 "mix":"mieszaj",
 "lookup":"wyszukaj",
-"shock":"poraź",
+"shock":"wstrząśnij",
 "paint":"maluj",
 "sand":"piasek",
 "water":"woda",
@@ -35,7 +35,7 @@
 "rock":"kamień",
 "rock_wall":"skała",
 "mudstone":"mułowiec",
-"packed_sand":"zbity_piasek",
+"packed_sand":"ubity_piasek",
 "plant":"roślina",
 "dead_plant":"martwa_roślina",
 "frozen_plant":"zamrożona_roślina",
@@ -50,7 +50,7 @@
 "rime":"szron",
 "snow":"śnieg",
 "slush":"błoto_pośniegowe",
-"packed_snow":"zbity_śnieg",
+"packed_snow":"ubity_śnieg",
 "wood":"drewno",
 "smoke":"dym",
 "magma":"magma",
@@ -412,7 +412,7 @@
 "gold_coin":"złota_moneta",
 "rust":"rdza",
 "oxidized_copper":"utleniona_miedź",
-"alga":"AlGa",
+"alga":"Alga",
 "metal_scrap":"kawałki_metalu",
 "glass_shard":"odłamek_szkła",
 "rad_shard":"odłamek_radioaktywnego_szkła",
@@ -457,22 +457,18 @@
 "greek_fire":"ogień_grecki",
 "fireball":"kula_ognia",
 "rocket":"rakieta",
-"sticky_bomb":"klejąca_bomba",
 "cold_bomb":"zimna_bomba",
 "hot_bomb":"gorąca_bomba",
-"electro_bomb":"elektro_bomba",
-"water_bomb":"bomba_wodna",
 "antimatter_bomb":"bomba_antymateryjna",
 "party_popper":"pukawka",
 "flashbang":"flashbang",
 "flash":"błysk",
 "smoke_grenade":"granat_dymny",
 "landmine":"mina",
-"cluster_bomb":"bomba_kasetowa",
 "armageddon":"armagedon",
 "tesla_coil":"cewka_tesli",
 "light_bulb":"żarówka",
-"shocker":"porażacz",
+"shocker":"wstrząsacz",
 "pressure_plate":"płytka_naciskowa",
 "primordial_soup":"zupa_pierwotna",
 "molten_slag":"stopiony_żużel",
@@ -528,20 +524,20 @@
 "molten_sodium_acetate":"stopiony_octan_sodu",
 "frozen_nitro":"zamrożona_nitrogliceryna",
 "cured_meat": "",
-"nut_oil": "",
+"nut_oil": "olej z orzechów",
 "grease": "",
-"fat": "",
+"fat": "tłuszcz",
-"potassium": "",
+"potassium": "potas",
-"molten_potassium": "",
+"molten_potassium": "roztopiony_potas",
 "magnesium": "",
 "molten_magnesium": "",
-"sandstorm": "",
+"sandstorm": "burza_piaskowa",
 "caustic_potash": "",
 "antibomb": "",
-"tornado": "",
+"tornado": "tornado",
-"earthquake": "",
+"earthquake": "trzęsienie_ziemi",
-"tsunami": "",
+"tsunami": "tsunami",
-"blaster": "",
+"blaster": "promień",
 "propane_ice": "",
 "molten_caustic_potash": ""
-}
+}

lang/pt_br.json

@@ -457,18 +457,14 @@
 "greek_fire":"fogo_grego",
 "fireball":"bola_de_fogo",
 "rocket":"foguete",
-"sticky_bomb":"bomba_pegajosa",
 "cold_bomb":"bomba_fria",
 "hot_bomb":"bomba_quente",
-"electro_bomb":"bomba_electro",
-"water_bomb":"bomba_de_água",
 "antimatter_bomb":"bomba_antimateria",
 "party_popper":"popper_de_festa",
 "flashbang":"granada_de_luz",
 "flash":"flash",
 "smoke_grenade":"grenada_de_fumaça",
 "landmine":"mina_terrestre",
-"cluster_bomb":"bomba_coletiva",
 "armageddon":"armagedom",
 "tesla_coil":"bobina_de_tesla",
 "light_bulb":"lampada",

lang/ru.json

@@ -457,18 +457,14 @@
 "greek_fire":"",
 "fireball":"",
 "rocket":"",
-"sticky_bomb":"",
 "cold_bomb":"",
 "hot_bomb":"",
-"electro_bomb":"",
-"water_bomb":"",
 "antimatter_bomb":"",
 "party_popper":"",
 "flashbang":"",
 "flash":"",
 "smoke_grenade":"дымовая граната",
 "landmine":"мина",
-"cluster_bomb":"кластерная бомба",
 "armageddon":"",
 "tesla_coil":"",
 "light_bulb":"",

lang/template.json

@@ -457,18 +457,14 @@
 "greek_fire": "",
 "fireball": "",
 "rocket": "",
-"sticky_bomb": "",
 "cold_bomb": "",
 "hot_bomb": "",
-"electro_bomb": "",
-"water_bomb": "",
 "antimatter_bomb": "",
 "party_popper": "",
 "flashbang": "",
 "flash": "",
 "smoke_grenade": "",
 "landmine": "",
-"cluster_bomb": "",
 "armageddon": "",
 "tesla_coil": "",
 "light_bulb": "",

lang/tok.json

@@ -457,18 +457,14 @@
 "greek_fire":"",
 "fireball":"",
 "rocket":"",
-"sticky_bomb":"",
 "cold_bomb":"",
 "hot_bomb":"",
-"electro_bomb":"",
-"water_bomb":"",
 "antimatter_bomb":"",
 "party_popper":"",
 "flashbang":"",
 "flash":"suno_lili",
 "smoke_grenade":"",
 "landmine":"",
-"cluster_bomb":"",
 "armageddon":"",
 "tesla_coil":"",
 "light_bulb":"",

lang/uk.json

@@ -457,18 +457,14 @@
 "greek_fire":"",
 "fireball":"",
 "rocket":"",
-"sticky_bomb":"",
 "cold_bomb":"",
 "hot_bomb":"",
-"electro_bomb":"",
-"water_bomb":"",
 "antimatter_bomb":"",
 "party_popper":"",
 "flashbang":"",
 "flash":"",
 "smoke_grenade":"",
 "landmine":"",
-"cluster_bomb":"",
 "armageddon":"",
 "tesla_coil":"",
 "light_bulb":"",

lang/vi.json

@@ -458,18 +458,14 @@
 "greek_fire": "Lửa Hi Lạp",
 "fireball": "Cầu lửa",
 "rocket": "Tên lửa",
-"sticky_bomb": "Bom dính",
 "cold_bomb": "Bom lạnh",
 "hot_bomb": "Bom nóng",
-"electro_bomb": "Bom điện",
-"water_bomb": "Bom nước ",
 "antimatter_bomb": "Bom phản vật chất",
 "party_popper": "Pháo giấy",
 "flashbang": "Bom choáng ",
 "flash": "Chóp sáng",
 "smoke_grenade": "Lựu đạn khói",
 "landmine": "Mìn",
-"cluster_bomb": "Bom cụm",
 "armageddon": "Tận thế",
 "tesla_coil": "Cuộn tesla",
 "light_bulb": "Bóng đèn",

lang/zh_cn.json

@@ -40,17 +40,17 @@
 "dead_plant":"死植物",
 "frozen_plant":"冰植物",
 "grass":"草",
-"algae":"",
+"algae":"藻类",
-"concrete":"",
+"concrete":"混凝土",
 "wall":"墙",
 "fire":"火",
 "bomb":"炸弹",
 "steam":"争气",
 "ice":"冰",
-"rime":"",
+"rime":"雾凇",
 "snow":"雪",
 "slush":"冰水",
-"packed_snow":"",
+"packed_snow":"积雪",
 "wood":"木",
 "smoke":"烟",
 "magma":"岩浆",
@@ -71,19 +71,19 @@
 "wire":"电线",
 "battery":"电瓶",
 "cloner":"克隆机",
-"sensor":"",
+"sensor":"感受器",
-"heater":"",
+"heater":"热机",
-"cooler":"",
+"cooler":"冷机",
 "random":"乱",
 "image":"图片",
-"unpaint":"",
+"unpaint":"取消画",
-"uncharge":"",
+"uncharge":"取消电",
-"unburn":"",
+"unburn":"取消烧",
 "smash":"砸",
-"filler":"",
+"filler":"填料",
 "lattice":"格子",
-"gravel":"lishlish",
+"gravel":"碎石",
-"slime":"",
+"slime":"粘液",
 "cement":"水泥",
 "dust":"灰尘",
 "void":"太虚",
@@ -91,7 +91,7 @@
 "cell":"细胞",
 "cancer":"癌",
 "dna":"DNA",
-"plague":"",
+"plague":"瘟疫",
 "worm":"蚯蚓",
 "frozen_worm":"冰蚯蚓",
 "flea":"跳蚤",
@@ -99,10 +99,10 @@
 "ant":"蚂蚁",
 "fly":"苍蝇",
 "firefly":"荧光虫",
-"hive":"",
+"hive":"蜜蜂窝",
 "bee":"蜜蜂",
-"stink_bug":"",
+"stink_bug":"臭虫",
-"dead_bug":"",
+"dead_bug":"死虫",
 "human":"人",
 "body":"生体",
 "head":"头",
@@ -113,11 +113,11 @@
 "tadpole":"蝌蚪",
 "fish":"鱼",
 "frozen_fish":"冰鱼",
-"slug":"",
+"slug":"蛞蝓",
 "snail":"蜗牛",
-"burner":"",
+"burner":"燃烧机",
-"superheater":"",
+"superheater":"过热机",
-"freezer":"",
+"freezer":"冷冻机",
 "pipe":"管",
 "pipe_wall":"管墙",
 "ewall":"电墙",
@@ -138,47 +138,47 @@
 "molten_ash":"熔融灰",
 "light":"光",
 "liquid_light":"夜光",
-"laser":"",
+"laser":"雷射",
 "ball":"圆圈",
-"pointer":"",
+"pointer":"指针",
-"charcoal":"",
+"charcoal":"木炭",
-"tinder":"",
+"tinder":"木材",
-"sawdust":"",
+"sawdust":"锯末",
-"hail":"",
+"hail":"冰雹",
 "hydrogen":"氢气",
 "oxygen":"氧气",
 "nitrogen":"氮气",
 "helium":"氦气",
-"anesthesia":"",
+"anesthesia":"麻醉",
 "ammonia":"氨气",
 "liquid_ammonia":"氨气液体",
-"carbon_dioxide":"",
+"carbon_dioxide":"二氧化碳",
 "oil":"油",
-"lamp_oil":"",
+"lamp_oil":"灯油",
-"propane":"",
+"propane":"丙烷",
-"methane":"",
+"methane":"甲烷",
-"liquid_methane":"",
+"liquid_methane":"液甲烷",
-"stained_glass":"",
+"stained_glass":"彩色玻璃",
-"molten_stained_glass":"",
+"molten_stained_glass":"熔彩色玻璃",
-"art":"",
+"art":"艺术",
 "rainbow":"彩虹",
-"static":"",
+"static":"電干扰",
-"border":"",
+"border":"边",
 "clay":"泥土",
 "clay_soil":"壤土",
 "brick":"砖",
-"ruins":"",
+"ruins":"废墟",
 "porcelain":"瓷",
-"sapling":"",
+"sapling":"树苗",
-"pinecone":"",
+"pinecone":"松果",
-"evergreen":"",
+"evergreen":"松树",
-"cactus":"",
+"cactus":"仙人掌",
 "seeds":"种子",
 "grass_seed":"草种子",
-"wheat_seed":"",
+"wheat_seed":"麦种子",
 "straw":"干草",
 "paper":"纸",
-"pollen":"",
+"pollen":"花粉",
 "flower_seed":"",
 "pistil":"",
 "petal":"",
@@ -258,23 +258,23 @@
 "molten_lead":"",
 "molten_solder":"",
 "juice":"果汁",
-"juice_ice":"",
+"juice_ice":"果汁冰",
 "broth":"汤",
 "milk":"牛奶",
 "chocolate_milk":"巧克力牛奶",
-"fruit_milk":"",
+"fruit_milk":"水果牛奶",
-"pilk":"",
+"pilk":"气水牛奶",
 "eggnog":"蛋奶",
 "egg":"蛋",
 "yolk":"蛋黄",
 "hard_yolk":"硬蛋黄",
-"nut_milk":"",
+"nut_milk":"坚果奶",
-"dough":"",
+"dough":"面团",
-"batter":"",
+"batter":"面糊",
-"homunculus":"",
+"homunculus":"何蒙库鲁兹",
 "butter":"牛油",
 "cheese":"芝士",
-"rotten_cheese":"",
+"rotten_cheese":"腐烂芝士",
 "chocolate":"巧克力",
 "grape":"葡萄",
 "vinegar":"醋",
@@ -308,13 +308,13 @@
 "nut_meat":"",
 "nut_butter":"",
 "jelly":"布丁",
-"baking_soda":"",
+"baking_soda":"苏打粉",
 "yogurt":"",
 "frozen_yogurt":"",
 "ice_cream":"冰淇凌",
 "cream":"奶油",
 "beans":"豆子",
-"dry_ice":"",
+"dry_ice":"干冰",
 "nitrogen_ice":"",
 "particleboard":"皮肤",
 "skin":"皮肤",
@@ -374,7 +374,7 @@
 "smog":"",
 "stench":"",
 "liquid_stench":"",
-"fragrance":"",
+"fragrance":"香水",
 "perfume":"香水",
 "cyanide":"",
 "cyanide_gas":"",
@@ -457,18 +457,14 @@
 "greek_fire":"",
 "fireball":"",
 "rocket":"",
-"sticky_bomb":"粘炸弹",
 "cold_bomb":"冷炸弹",
 "hot_bomb":"热炸弹",
-"electro_bomb":"电炸弹",
-"water_bomb":"水炸弹",
 "antimatter_bomb":"",
 "party_popper":"",
 "flashbang":"光榴弹",
 "flash":"",
 "smoke_grenade":"烟榴弹",
 "landmine":"",
-"cluster_bomb":"",
 "armageddon":"",
 "tesla_coil":"",
 "light_bulb":"灯泡",

lang/zh_hant.json

@@ -457,18 +457,14 @@
 "greek_fire":"希臘火",
 "fireball":"火球",
 "rocket":"火箭",
-"sticky_bomb":"粘炸彈",
 "cold_bomb":"冷炸彈",
 "hot_bomb":"熱炸彈",
-"electro_bomb":"電炸彈",
-"water_bomb":"水炸彈",
 "antimatter_bomb":"反物質炸彈",
 "party_popper":"紙屑炸彈",
 "flashbang":"閃光彈",
 "flash":"閃光",
 "smoke_grenade":"煙炸藥",
 "landmine":"地雷",
-"cluster_bomb":"集束炸彈",
 "armageddon":"世界末日",
 "tesla_coil":"特斯拉線圈",
 "light_bulb":"電燈",

mods/purple_guys_mod.js

@@ -0,0 +1,173 @@
+elements.super_bomb = {
+    color: "#551c41",
+    behavior: [
+        "XX|EX:125|XX",
+        "XX|XX|XX",
+        "M2|M1 AND EX:125|M2",
+    ],
+    category: "Purple Guy's Mod", 
+    state: "solid",
+    density: 1300,
+    excludeRandom: true,
+    cooldown: defaultCooldown
+}
+
+elements.mega_bomb = { 
+    color: "#736e7e", 
+    behavior: [
+        "XX|EX:350|XX", 
+        "XX|XX|XX",
+        "M2|M1 AND EX:350|M2",
+    ],
+    category: "Purple Guy's Mod", 
+    state: "solid",
+    density: 1300,
+    excludeRandom: true,
+    cooldown: defaultCooldown
+}
+
+elements.ultra_bomb = { 
+    color: "#79910a", 
+    behavior: [
+        "XX|EX:500>plasma2|XX", 
+        "XX|XX|XX",
+        "M2|M1 AND EX:500>plasma2|M2",
+    ],
+    category: "Purple Guy's Mod", 
+    state: "solid",
+    density: 1300,
+    excludeRandom: true,
+    cooldown: defaultCooldown
+}
+
+elements.ice_cream_bomb = { 
+    color: "#ffffff", 
+    behavior: [
+        "XX|EX:20>ice_cream|XX", 
+        "XX|XX|XX",
+        "M2|M1 AND EX:20>ice_cream|M2",
+    ],
+    category: "Purple Guy's Mod", 
+    state: "solid",
+    density: 1300,
+    excludeRandom: true,
+    cooldown: defaultCooldown
+}
+
+
+elements.dirty_sand = { 
+    color: ["#a35222", "#a15122", "#7e3f1a", "#f4ba9a", "#fed3ba", "#f2b796"],
+    behavior: behaviors.POWDER,
+    category: "Purple Guy's Mod", 
+    state: "solid",
+    density: 2822
+}
+
+elements.wet_dirty_sand = { 
+    color: ["#a35210", "#a15110", "#7e3f0a", "#f4ba8a", "#fed2ba", "#f2b784"],
+    behavior: behaviors.POWDER,
+    category: "Purple Guy's Mod", 
+    state: "liquid",
+    density: 2822
+}
+
+elements.reverse_gravity_liquid = { 
+    color: "#cdd7e2",
+    behavior: behaviors.AGLIQUID	,
+    category: "Purple Guy's Mod", 
+    state: "liquid",
+    density: 50
+}
+
+elements.reverse_soda = { 
+    color: ["#5f2706", "#48230d", "#52250a"],
+    behavior: behaviors.AGLIQUID	,  behavior: [
+        "M2|M1|M2",
+        "M2|XX|M2",
+        "XX|CR:foam%3|XX",
+    ],
+
+    category: "Purple Guy's Mod", 
+    state: "liquid",
+    density: 1030
+}
+
+elements.negatively_dense_liquid = { 
+    color: "#94ffd1",
+    behavior: behaviors.LIQUID	,
+    category: "Purple Guy's Mod", 
+    state: "liquid",
+    density: -2000
+}
+
+elements.plasma2 = { 
+    color: "#caf7ff",
+    behavior: behaviors.DGAS	,
+    category: "Purple Guy's Mod", 
+    state: "gas",
+    density: 50000,
+    temp:500000
+}
+
+elements.negative_fire = { 
+    color: ["#a6bfc4", "#6bd2e4", "#b8dee4", "#32cae4"],
+    behavior: behaviors.DGAS	,
+    category: "Purple Guy's Mod", 
+    state: "gas",
+    density: -0.1,
+    temp:-20000
+}
+
+elements.coldest_bomb = { 
+    color: "#fffff0", 
+    behavior: [
+        "XX|EX:55>negative_fire|XX", 
+        "XX|XX|XX",
+        "M2|M1 AND EX:55>negative_fire|M2",
+    ],
+    category: "Purple Guy's Mod", 
+    state: "solid",
+    density: 1300,
+    excludeRandom: true,
+    cooldown: defaultCooldown
+}
+
+elements.reinforced_wall = { 
+    color: "#ffff01", 
+    behavior: behaviors.WALL,
+    category: "Purple Guy's Mod", 
+    state: "solid",
+    density: 1300,
+    hardness:10^81
+}
+
+elements.unreinforced_wall = { 
+    color: "#ffff82", 
+    behavior: behaviors.WALL,
+    category: "Purple Guy's Mod", 
+    state: "solid",
+    density: 1300,
+    hardness:0
+}
+
+elements.reinforced_liquid_wall = { 
+    color: "#ffff01", 
+    behavior: behaviors.WALL,
+    category: "Purple Guy's Mod", 
+    state: "liquid",
+    density: 1300,
+    hardness:10^81
+}
+
+
+if (!elements.sand.reactions) { elements.sand.reactions = {} }
+elements.sand.reactions.dirt = { elem1:"dirty_sand", elem2:"dirty_sand" }
+
+if (!elements.dirty_sand.reactions) { elements.dirty_sand.reactions = {} }
+elements.dirty_sand.reactions.water = { elem1:"wet_dirty_sand", elem2:"wet_dirty_sand" }
+
+if (!elements.soda.reactions) { elements.soda.reactions = {} }
+elements.soda.reactions.reverse_gravity_liquid = { elem1:"reverse_soda", elem2:"reverse_soda" }
+
+if (!elements.wall.reactions) { elements.wall.reactions = {} }
+elements.wall.reactions.plasma2 = { elem1:"plasma2", elem2:"plasma2" }