2. FoE Helper
  3. Extension
  4. Changes

andr_gin

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/sv.json
Auto-merging js/web/_i18n/ru.json
Auto-merging js/web/_i18n/nl.json
CONFLICT (content): Merge conflict in js/web/_i18n/nl.json
Auto-merging js/web/_i18n/hu.json
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Auto-merging js/web/_i18n/en.json
CONFLICT (content): Merge conflict in js/web/_i18n/en.json
Auto-merging js/web/_i18n/de.json
CONFLICT (content): Merge conflict in js/web/_i18n/de.json
Auto-merging js/web/_i18n/cs.json
CONFLICT (content): Merge conflict in js/web/_i18n/cs.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
andr_gin

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/sv.json
Auto-merging js/web/_i18n/ru.json
Auto-merging js/web/_i18n/nl.json
CONFLICT (content): Merge conflict in js/web/_i18n/nl.json
Auto-merging js/web/_i18n/hu.json
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Auto-merging js/web/_i18n/en.json
CONFLICT (content): Merge conflict in js/web/_i18n/en.json
Auto-merging js/web/_i18n/de.json
CONFLICT (content): Merge conflict in js/web/_i18n/de.json
Auto-merging js/web/_i18n/cs.json
CONFLICT (content): Merge conflict in js/web/_i18n/cs.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/sv.json
Auto-merging js/web/_i18n/ru.json
Auto-merging js/web/_i18n/nl.json
CONFLICT (content): Merge conflict in js/web/_i18n/nl.json
Auto-merging js/web/_i18n/hu.json
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Auto-merging js/web/_i18n/en.json
CONFLICT (content): Merge conflict in js/web/_i18n/en.json
Auto-merging js/web/_i18n/de.json
CONFLICT (content): Merge conflict in js/web/_i18n/de.json
Auto-merging js/web/_i18n/cs.json
CONFLICT (content): Merge conflict in js/web/_i18n/cs.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/sv.json
Auto-merging js/web/_i18n/ru.json
Auto-merging js/web/_i18n/nl.json
CONFLICT (content): Merge conflict in js/web/_i18n/nl.json
Auto-merging js/web/_i18n/hu.json
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Auto-merging js/web/_i18n/en.json
CONFLICT (content): Merge conflict in js/web/_i18n/en.json
Auto-merging js/web/_i18n/de.json
CONFLICT (content): Merge conflict in js/web/_i18n/de.json
Auto-merging js/web/_i18n/cs.json
CONFLICT (content): Merge conflict in js/web/_i18n/cs.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Suggestion added

FoE Helper / Extension — Russian

Open the castle overview to update the data.
От кройте Обзор замка, чтобы обновить данные
3 years ago
None

Suggestion added

FoE Helper / Extension — Russian

Open the antique dealer to update the data.
Откройте антиквара, чтобы обновить данные
3 years ago
None

Suggestion added

FoE Helper / Extension — Russian

Unknown
Неизвестный
3 years ago
None

Suggestion added

FoE Helper / Extension — Russian

show group names
показать имена группы
3 years ago
None

Suggestion added

FoE Helper / Extension — Russian

7-Day Challenge
Недельное испытание
3 years ago
None

Suggestion added

FoE Helper / Extension — Russian

Log duration
Диапазон логов
3 years ago
None

Suggestion added

FoE Helper / Extension — Russian

Log
Логфайл
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/sv.json
Auto-merging js/web/_i18n/ru.json
Auto-merging js/web/_i18n/nl.json
CONFLICT (content): Merge conflict in js/web/_i18n/nl.json
Auto-merging js/web/_i18n/hu.json
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Auto-merging js/web/_i18n/en.json
CONFLICT (content): Merge conflict in js/web/_i18n/en.json
Auto-merging js/web/_i18n/de.json
CONFLICT (content): Merge conflict in js/web/_i18n/de.json
Auto-merging js/web/_i18n/cs.json
CONFLICT (content): Merge conflict in js/web/_i18n/cs.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/sv.json
Auto-merging js/web/_i18n/ru.json
Auto-merging js/web/_i18n/nl.json
CONFLICT (content): Merge conflict in js/web/_i18n/nl.json
Auto-merging js/web/_i18n/hu.json
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Auto-merging js/web/_i18n/en.json
CONFLICT (content): Merge conflict in js/web/_i18n/en.json
Auto-merging js/web/_i18n/de.json
CONFLICT (content): Merge conflict in js/web/_i18n/de.json
Auto-merging js/web/_i18n/cs.json
CONFLICT (content): Merge conflict in js/web/_i18n/cs.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/sv.json
Auto-merging js/web/_i18n/ru.json
Auto-merging js/web/_i18n/nl.json
CONFLICT (content): Merge conflict in js/web/_i18n/nl.json
Auto-merging js/web/_i18n/hu.json
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Auto-merging js/web/_i18n/en.json
CONFLICT (content): Merge conflict in js/web/_i18n/en.json
Auto-merging js/web/_i18n/de.json
CONFLICT (content): Merge conflict in js/web/_i18n/de.json
Auto-merging js/web/_i18n/cs.json
CONFLICT (content): Merge conflict in js/web/_i18n/cs.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/sv.json
Auto-merging js/web/_i18n/ru.json
Auto-merging js/web/_i18n/nl.json
CONFLICT (content): Merge conflict in js/web/_i18n/nl.json
Auto-merging js/web/_i18n/hu.json
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Auto-merging js/web/_i18n/en.json
CONFLICT (content): Merge conflict in js/web/_i18n/en.json
Auto-merging js/web/_i18n/de.json
CONFLICT (content): Merge conflict in js/web/_i18n/de.json
Auto-merging js/web/_i18n/cs.json
CONFLICT (content): Merge conflict in js/web/_i18n/cs.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/sv.json
Auto-merging js/web/_i18n/ru.json
Auto-merging js/web/_i18n/nl.json
CONFLICT (content): Merge conflict in js/web/_i18n/nl.json
Auto-merging js/web/_i18n/hu.json
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Auto-merging js/web/_i18n/en.json
CONFLICT (content): Merge conflict in js/web/_i18n/en.json
Auto-merging js/web/_i18n/de.json
CONFLICT (content): Merge conflict in js/web/_i18n/de.json
Auto-merging js/web/_i18n/cs.json
CONFLICT (content): Merge conflict in js/web/_i18n/cs.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/sv.json
Auto-merging js/web/_i18n/ru.json
Auto-merging js/web/_i18n/nl.json
CONFLICT (content): Merge conflict in js/web/_i18n/nl.json
Auto-merging js/web/_i18n/hu.json
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Auto-merging js/web/_i18n/en.json
CONFLICT (content): Merge conflict in js/web/_i18n/en.json
Auto-merging js/web/_i18n/de.json
CONFLICT (content): Merge conflict in js/web/_i18n/de.json
Auto-merging js/web/_i18n/cs.json
CONFLICT (content): Merge conflict in js/web/_i18n/cs.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/sv.json
Auto-merging js/web/_i18n/ru.json
Auto-merging js/web/_i18n/nl.json
CONFLICT (content): Merge conflict in js/web/_i18n/nl.json
Auto-merging js/web/_i18n/hu.json
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Auto-merging js/web/_i18n/en.json
CONFLICT (content): Merge conflict in js/web/_i18n/en.json
Auto-merging js/web/_i18n/de.json
CONFLICT (content): Merge conflict in js/web/_i18n/de.json
Auto-merging js/web/_i18n/cs.json
CONFLICT (content): Merge conflict in js/web/_i18n/cs.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/sv.json
Auto-merging js/web/_i18n/ru.json
Auto-merging js/web/_i18n/nl.json
CONFLICT (content): Merge conflict in js/web/_i18n/nl.json
Auto-merging js/web/_i18n/hu.json
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Auto-merging js/web/_i18n/en.json
CONFLICT (content): Merge conflict in js/web/_i18n/en.json
Auto-merging js/web/_i18n/de.json
CONFLICT (content): Merge conflict in js/web/_i18n/de.json
Auto-merging js/web/_i18n/cs.json
CONFLICT (content): Merge conflict in js/web/_i18n/cs.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/sv.json
Auto-merging js/web/_i18n/ru.json
Auto-merging js/web/_i18n/nl.json
CONFLICT (content): Merge conflict in js/web/_i18n/nl.json
Auto-merging js/web/_i18n/hu.json
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Auto-merging js/web/_i18n/en.json
CONFLICT (content): Merge conflict in js/web/_i18n/en.json
Auto-merging js/web/_i18n/de.json
CONFLICT (content): Merge conflict in js/web/_i18n/de.json
Auto-merging js/web/_i18n/cs.json
CONFLICT (content): Merge conflict in js/web/_i18n/cs.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago

Search