Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Beta #2938

Merged
merged 243 commits into from
Sep 28, 2024
Merged

Beta #2938

merged 243 commits into from
Sep 28, 2024

Conversation

mainIine
Copy link
Owner

No description provided.

outoftheline and others added 30 commits March 23, 2024 10:29
@outoftheline
NewCityData Productions init
da106b8
@outoftheline
CityData fixes
9bcb6c6
@Linnun
Fixed citymap scale not working for qi map
dd810b0
@outoftheline
production prograss, citymap additions
221d910
@outoftheline
Merge branch 'beta' into newproductions
2276db1
@outoftheline
Merge branch 'beta' into newproductions
3d5fdea
@outoftheline
progress
4fac1b6
@outoftheline
productions/citymap: fix happiness
2dc5592
@outoftheline
productions: coins and supplies, sums
92e226a
@outoftheline
productions motivated/base
a1cea83
@outoftheline
Update productions.js
06b3501
@outoftheline
productions: boost tabs
013f7be
@outoftheline
Merge branch 'beta' into newproductions
e20e161
@outoftheline
productions: grouped table
b4eea95
@outoftheline
productions: sorting
7ce16ff
@outoftheline
productions: sorting
1d4ab58
@outoftheline
NewCityEntity: handle town hall, castle system, hall of fame
f120150
@outoftheline
productions: goods preparations, bugfixes
3ea2e9a
@outoftheline
Added Era shorthands
2d0bb66
@outoftheline
Productions: goods
97bf619
@outoftheline
save progress
b814fa3
@outoftheline
translations
4d7785a
@outoftheline
Merge branch 'beta' into newproductions
3e9b5b2
@outoftheline
Productions: random, items
7a68049
@outoftheline
Productions: efficiency rating data
adb00f5
@outoftheline
ProductionRatings: translations, ratings, icons
f666f9a
@outoftheline
productions rating sorting
7478813
@outoftheline
citymap/productions: chains and sets setup
52fec81
@outoftheline
citymap: chain buildings
ada19e2
@outoftheline
Productions: bugfixes, unit icons
270ba09
weblate and others added 29 commits September 22, 2024 00:13
@weblate
Currently translated at 100.0% (1475 of 1475 strings)
9ced8c4 
Translation: FoE Helper/Extension
Translate-URL: http://i18n.foe-helper.com/projects/foe-helper/extension/fr/
@weblate
Merge branch 'origin/beta'
fa169d2
@weblate
Currently translated at 100.0% (1481 of 1481 strings)
fbd5733 
Translation: FoE Helper/Extension
Translate-URL: http://i18n.foe-helper.com/projects/foe-helper/extension/fr/
@weblate
Currently translated at 6.2% (93 of 1481 strings)
cec3fa7 
Translation: FoE Helper/Extension
Translate-URL: http://i18n.foe-helper.com/projects/foe-helper/extension/ja/
@weblate
Currently translated at 100.0% (1481 of 1481 strings)
4ccf1e7 
Translation: FoE Helper/Extension
Translate-URL: http://i18n.foe-helper.com/projects/foe-helper/extension/fr/
@Beelzebob6666
efficiency - re-add building count
0aa7a44
@Beelzebob6666
Merge branch 'beta' of https://github.com/mainIine/foe-helfer-extension…
02d6179 
… into beta
@outoftheline
added total amount of buildings to map
d70ab66
@outoftheline
bugfix erzdruidenhütte
355e0ea
@weblate
Currently translated at 8.1% (121 of 1481 strings)
01fd915 
Translation: FoE Helper/Extension
Translate-URL: http://i18n.foe-helper.com/projects/foe-helper/extension/ja/
@weblate
Merge branch 'origin/beta'
bc99386
@Beelzebob6666
citymap - change in certain goods recognition
897b8a8
@Beelzebob6666
Merge branch 'beta' of https://github.com/mainIine/foe-helfer-extension…
0a25762 
… into beta
@Beelzebob6666
citymap - simplify regex
b6ef07c
@Beelzebob6666
efficiency - exclude certain buildings from beeing addable
8c53d76
@JuberFoE
added QI citymap stuff (#2937)
ac5c36f 
* added QI citymap stuff

added QI stats to BoostsSum
added Coin/Supply boosts to QI building productions
replaced QIStats actions with real boost (to include main city boosts)

* changelog
@Beelzebob6666
boost-inventory - streamline inventory scan
d6b6405
@weblate
Currently translated at 100.0% (1484 of 1484 strings)
8aff856 
Translation: FoE Helper/Extension
Translate-URL: http://i18n.foe-helper.com/projects/foe-helper/extension/fr/
@weblate
Merge branch 'origin/beta'
066ae58
@Beelzebob6666
efficiency - no wrap between count and eye
1b2574b
@Beelzebob6666
Merge branch 'beta' of https://github.com/mainIine/foe-helfer-extension…
22ff00d 
… into beta
@outoftheline
added genB random goods production
32fb7c0
@outoftheline
bugfix random nextage goods
6933d67
@weblate
Currently translated at 100.0% (1484 of 1484 strings)
d59eb13 
Translation: FoE Helper/Extension
Translate-URL: http://i18n.foe-helper.com/projects/foe-helper/extension/fr/
@weblate
Merge branch 'origin/beta'
ff54a53
@Beelzebob6666
cardgame - remove halloween
a6cc175
@Beelzebob6666
Merge branch 'beta' of https://github.com/mainIine/foe-helfer-extension…
45375cf 
… into beta
@Beelzebob6666
goods + outposts - fix polynesia goods
2594da4
@weblate
Currently translated at 10.1% (151 of 1484 strings)
4ee383a 
Translation: FoE Helper/Extension
Translate-URL: http://i18n.foe-helper.com/projects/foe-helper/extension/ja/
@mainIine mainIine merged commit 4353ab7 into master Sep 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@mainIine @outoftheline @Linnun @Beelzebob6666 @weblate @x-sitter @JuberFoE