Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken 2022-08-04 18:43:42 -04:00
commit f9c73c2fdc
2 changed files with 4 additions and 4 deletions

View File

@ -1221,7 +1221,7 @@ liquid.water.name = 물
liquid.slag.name = 광재
liquid.oil.name = 석유
liquid.cryofluid.name = 냉각수
liquid.neoplasm.name = 종양
liquid.neoplasm.name = 신생물
liquid.arkycite.name = 아르키사이트
liquid.gallium.name = 갈륨
liquid.ozone.name = 오존
@ -1661,8 +1661,8 @@ block.diffuse.name = 디퓨즈
block.basic-assembler-module.name = 기본 조립 모듈
block.smite.name = 스마이트
block.malign.name = 멀라인
block.flux-reactor.name = Flux Reactor
block.neoplasia-reactor.name = Neoplasia Reactor
block.flux-reactor.name = 융제 원자로
block.neoplasia-reactor.name = 신생물 원자로
block.switch.name = 스위치
block.micro-processor.name = 마이크로 프로세서

View File

@ -54,7 +54,7 @@
},
{
"name": "Phoenix Network",
"address": ["172.104.253.198", "172.104.253.198:6464"]
"address": ["phoenix-network.dev", "phoenix-network.dev:6464"]
},
{
"name": "Xpdustry",