Skip to content
[Jenkins]Jenkins
log in
Failed

Changes

Summary

  1. Convert some easy block and container names (details)
  2. Hunt down some of the last untranslated blocks manually ^^ (details)
  3. Fix 3x Insulated Iron Cable missing item model (details)
  4. Convert advancements translations (details)
  5. Convert some container names and tooltip translations (details)
  6. Infer some missing container names from their block names (details)
  7. Fix compile errors after merge.. (details)
Commit 4c4208f2d2f192487a9fcb71b710b4dcf65c0ff8 by reoseah9
Convert some easy block and container names
The file was modifiedres-generated/assets/ic2/lang/sv_se.json
The file was modifiedres-generated/assets/ic2/lang/es_ve.json
The file was modifiedres-generated/assets/ic2/lang/en_ic.json
The file was modifiedres-generated/assets/ic2/lang/pt_pt.json
The file was modifiedres-generated/assets/ic2/lang/it_it.json
The file was modifiedres-generated/assets/ic2/lang/tr_tr.json
The file was modifiedres-generated/assets/ic2/lang/ko_kr.json
The file was modifiedres-generated/assets/ic2/lang/de_de.json
The file was modifiedres-generated/assets/ic2/lang/en_us.json
The file was modifiedres-generated/assets/ic2/lang/es_ar.json
The file was modifiedres-generated/assets/ic2/lang/es_es.json
The file was modifiedres-generated/assets/ic2/lang/pl_pl.json
The file was modifiedres-generated/assets/ic2/lang/uk_ua.json
The file was modifiedres-generated/assets/ic2/lang/en_gb.json
The file was modifiedres-generated/assets/ic2/lang/es_mx.json
The file was modifiedres-generated/assets/ic2/lang/zh_tw.json
The file was modifiedres-generated/assets/ic2/lang/fr_ca.json
The file was modifiedres-generated/assets/ic2/lang/fr_fr.json
The file was modifiedres-generated/assets/ic2/lang/zh_cn.json
The file was modifiedres-generated/assets/ic2/lang/pt_br.json
The file was modifiedsrc/ic2/data/OldToNewLangConverter.java
The file was modifiedres-generated/assets/ic2/lang/es_uy.json
The file was modifiedres-generated/assets/ic2/lang/ja_jp.json
The file was modifiedres-generated/assets/ic2/lang/ru_ru.json
Commit c978162ae152a4ac51e03144bd352e736ed9cfb6 by reoseah9
Hunt down some of the last untranslated blocks manually ^^
The file was modifiedres-generated/assets/ic2/lang/fr_fr.json
The file was modifiedres-generated/assets/ic2/lang/ja_jp.json
The file was modifiedres-generated/assets/ic2/lang/en_gb.json
The file was modifiedres-generated/assets/ic2/lang/es_ar.json
The file was modifiedres-generated/assets/ic2/lang/zh_cn.json
The file was modifiedres-generated/assets/ic2/lang/tr_tr.json
The file was modifiedres-generated/assets/ic2/lang/zh_tw.json
The file was modifiedres-generated/assets/ic2/lang/es_mx.json
The file was modifiedres-generated/assets/ic2/lang/pl_pl.json
The file was modifiedres-generated/assets/ic2/lang/en_us.json
The file was modifiedres-generated/assets/ic2/lang/pt_pt.json
The file was modifiedres-generated/assets/ic2/lang/es_es.json
The file was modifiedres-generated/assets/ic2/lang/fr_ca.json
The file was modifiedres-generated/assets/ic2/lang/es_uy.json
The file was modifiedres-generated/assets/ic2/lang/sv_se.json
The file was modifiedres-generated/assets/ic2/lang/ko_kr.json
The file was modifiedres-generated/assets/ic2/lang/ru_ru.json
The file was modifiedres-generated/assets/ic2/lang/de_de.json
The file was modifiedres-generated/assets/ic2/lang/pt_br.json
The file was modifiedres-generated/assets/ic2/lang/it_it.json
The file was modifiedsrc/ic2/data/OldToNewLangConverter.java
The file was modifiedres-generated/assets/ic2/lang/uk_ua.json
The file was modifiedres-generated/assets/ic2/lang/es_ve.json
Commit 21af9b0d71b6409d834ccd618a8bced86b009e76 by reoseah9
Fix 3x Insulated Iron Cable missing item model
The file was addedresources/assets/ic2/models/item/triple_insulated_iron_cable.json
Commit 15a0ac2844c6100df08fa19b55bda2937aa0ba8e by reoseah9
Convert advancements translations

A few newly added ones aren't translated as they simply don't exist in old files (seems like energy crystal and insulated cable)
The file was modifiedres-generated/assets/ic2/lang/es_uy.json
The file was modifiedres-generated/assets/ic2/lang/en_gb.json
The file was modifiedres-generated/assets/ic2/lang/en_ic.json
The file was modifiedres-generated/assets/ic2/lang/es_ve.json
The file was modifiedres-generated/assets/ic2/lang/zh_cn.json
The file was modifiedres-generated/assets/ic2/lang/zh_tw.json
The file was modifiedres-generated/assets/ic2/lang/es_mx.json
The file was modifiedres-generated/assets/ic2/lang/tr_tr.json
The file was modifiedsrc/ic2/data/OldToNewLangConverter.java
The file was modifiedres-generated/assets/ic2/lang/ko_kr.json
The file was modifiedres-generated/assets/ic2/lang/ja_jp.json
The file was modifiedres-generated/assets/ic2/lang/pl_pl.json
The file was modifiedres-generated/assets/ic2/lang/en_us.json
The file was modifiedres-generated/assets/ic2/lang/sv_se.json
The file was modifiedres-generated/assets/ic2/lang/uk_ua.json
The file was modifiedres-generated/assets/ic2/lang/it_it.json
The file was modifiedres-generated/assets/ic2/lang/pt_pt.json
The file was modifiedres-generated/assets/ic2/lang/fr_ca.json
The file was modifiedres-generated/assets/ic2/lang/fr_fr.json
The file was modifiedres-generated/assets/ic2/lang/pt_br.json
The file was modifiedres-generated/assets/ic2/lang/de_de.json
The file was modifiedres-generated/assets/ic2/lang/es_es.json
The file was modifiedres-generated/assets/ic2/lang/ru_ru.json
The file was modifiedres-generated/assets/ic2/lang/es_ar.json
Commit 1aa66a6638838b579c9055095deca40d46779b27 by reoseah9
Convert some container names and tooltip translations
The file was modifiedres-generated/assets/ic2/lang/tr_tr.json
The file was modifiedres-generated/assets/ic2/lang/zh_tw.json
The file was modifiedres-generated/assets/ic2/lang/uk_ua.json
The file was modifiedres-generated/assets/ic2/lang/es_ve.json
The file was modifiedres-generated/assets/ic2/lang/es_es.json
The file was modifiedres-generated/assets/ic2/lang/fr_fr.json
The file was modifiedres-generated/assets/ic2/lang/it_it.json
The file was modifiedsrc/ic2/data/OldToNewLangConverter.java
The file was modifiedres-generated/assets/ic2/lang/ru_ru.json
The file was modifiedres-generated/assets/ic2/lang/en_us.json
The file was modifiedres-generated/assets/ic2/lang/ko_kr.json
The file was modifiedres-generated/assets/ic2/lang/ja_jp.json
The file was modifiedres-generated/assets/ic2/lang/en_gb.json
The file was modifiedres-generated/assets/ic2/lang/es_mx.json
The file was modifiedres-generated/assets/ic2/lang/pl_pl.json
The file was modifiedres-generated/assets/ic2/lang/es_uy.json
The file was modifiedres-generated/assets/ic2/lang/fr_ca.json
The file was modifiedres-generated/assets/ic2/lang/de_de.json
The file was modifiedres-generated/assets/ic2/lang/es_ar.json
The file was modifiedres-generated/assets/ic2/lang/pt_br.json
The file was modifiedres-generated/assets/ic2/lang/sv_se.json
The file was modifiedres-generated/assets/ic2/lang/zh_cn.json
Commit c1b4165e3a66ef7fefb695af51300752209029af by reoseah9
Infer some missing container names from their block names
The file was modifiedres-generated/assets/ic2/lang/fr_ca.json
The file was modifiedres-generated/assets/ic2/lang/it_it.json
The file was modifiedres-generated/assets/ic2/lang/en_us.json
The file was modifiedres-generated/assets/ic2/lang/es_uy.json
The file was modifiedsrc/ic2/data/OldToNewLangConverter.java
The file was modifiedres-generated/assets/ic2/lang/pt_pt.json
The file was modifiedres-generated/assets/ic2/lang/zh_tw.json
The file was modifiedres-generated/assets/ic2/lang/ru_ru.json
The file was modifiedres-generated/assets/ic2/lang/pt_br.json
The file was modifiedres-generated/assets/ic2/lang/sv_se.json
The file was modifiedres-generated/assets/ic2/lang/zh_cn.json
The file was modifiedsrc/ic2/core/item/reactor/AbstractDamageableReactorComponent.java
The file was modifiedres-generated/assets/ic2/lang/ko_kr.json
The file was modifiedres-generated/assets/ic2/lang/es_ve.json
The file was modifiedres-generated/assets/ic2/lang/de_de.json
The file was modifiedres-generated/assets/ic2/lang/tr_tr.json
The file was modifiedres-generated/assets/ic2/lang/en_ic.json
The file was modifiedres-generated/assets/ic2/lang/es_mx.json
The file was modifiedres-generated/assets/ic2/lang/en_gb.json
The file was modifiedres-generated/assets/ic2/lang/es_ar.json
The file was modifiedres-generated/assets/ic2/lang/ja_jp.json
The file was modifiedsrc/ic2/core/item/ElectricItemTooltipHandler.java
The file was modifiedsrc/ic2/core/item/upgrade/ItemUpgradeModule.java
The file was modifiedsrc/ic2/core/item/reactor/ItemReactorHeatStorage.java
The file was modifiedsrc/ic2/core/item/tool/ItemToolCrafting.java
The file was modifiedres-generated/assets/ic2/lang/pl_pl.json
The file was modifiedres-generated/assets/ic2/lang/es_es.json
The file was modifiedres-generated/assets/ic2/lang/uk_ua.json
The file was modifiedres-generated/assets/ic2/lang/fr_fr.json
Commit ba3c15ce8c48f5b9f9a1b6bc6222bc3b58136a78 by reoseah9
Fix compile errors after merge..
The file was modifiedsrc/ic2/core/item/upgrade/ItemUpgradeModule.java
The file was modifiedsrc/ic2/core/item/reactor/ItemReactorHeatStorage.java
The file was modifiedsrc/ic2/core/item/ElectricItemTooltipHandler.java
The file was modifiedsrc/ic2/core/item/tool/ItemToolCrafting.java
The file was modifiedsrc/ic2/core/item/reactor/AbstractDamageableReactorComponent.java