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

Recycling center #5738

Merged
merged 13 commits into from
Dec 3, 2021
Merged

Recycling center #5738

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0f1e880
Add support to UniqueType.MaxNumberBuilding (including rejectionReasons)
Nov 22, 2021
9ca9be5
Fix typo
Nov 22, 2021
d22d3f6
Merge remote-tracking branch 'origin/master' into recycling_center
Nov 28, 2021
d82e7f2
adding Recycling Center icon
Nov 28, 2021
37deeb8
Credit update for icon
Nov 28, 2021
9f61379
Merge remote-tracking branch 'origin/master' into recycling_center
Nov 30, 2021
f8d45b9
Fix using placeholderText
Nov 30, 2021
97f8dc5
Rejection Text now working
Dec 2, 2021
dbc62f8
Merge remote-tracking branch 'origin/master' into recycling_center
Dec 2, 2021
9d795f6
Remove odd extra lines
Dec 2, 2021
949ebd8
extra lines
Dec 2, 2021
dca6b88
Remove excessive if statement in shouldBeDisplayed
Dec 3, 2021
804ed35
Adding code to remove building in transferred city
Dec 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/master' into recycling_center
  • Loading branch information
temurakami committed Nov 28, 2021
commit d22d3f6ba9001a58a68731b12c45e261b00de2d9

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.