Brackets, again! #49
Merged
Brackets, again! #49
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rderekp
added a commit
that referenced
this pull request
Apr 15, 2020
* POP fix * fix prov name * nemunas/memel fix * Update map-provinces.csv * pops change * Map changes, take note. Balkans! * San Stefano borders * fixed broken turkish pops * Delete CounterRevolution.txt Co-authored-by: JmanThunder <[email protected]> Co-authored-by: RedstoneCobra <[email protected]> Co-authored-by: Hammonia <[email protected]>
rderekp
added a commit
that referenced
this pull request
Apr 27, 2020
* Whoops Crash * Revert "Merge branch 'Developer-Build' of https://github.com/JmanThunder/The-Grand-Combo into Developer-Build" This reverts commit 5757bda, reversing changes made to 6fdf599. * hispaniola * Update positions.txt * Minor Province FIxes * Update provinces.bmp * Brand's Genoa * ton of FINLAND stuff * Update events_0010000.csv * Revert "Minor Province FIxes" This reverts commit aebc2b6. * Revert "Revert "Minor Province FIxes"" This reverts commit 7fa6eec. * Fix crash & some event localisation * Macedonia & more * sls * provinces.bmp fix * turned it around lol * Unf***** the map * Preliminary Balkan rework * Non-Event Localisation Update * minor Faith localisation changes * prov positions * tampere * Province changes Balkans * clean up * Minor border change in North Epirus * Removed Greek core until claimed * Removed auto-province renaming * fixes * Event Localisation * Balkan provinces, Congress of Berlin, Alevi * Corrected some cores * Berlin congress minor fix * Minor balkan changes * Japan Remake * Japan Remake * map stuff * made Macedonian Principality vassal of ott * Minor balkan changes * asia minor * lil' fix * Update positions.txt * fixed region.txt * Makedon Imareti flag * Preliminary Anatolian changes * Revert "Preliminary Anatolian changes" This reverts commit 56a025e. * Preliminary Anatolian Changes, fixed * Pre-1831 flag disappearance * Baden flag change * flagged * balkan fun * servia * y * fix * Berlin Congressss * Basic changes, needs fine tuning * brö * Country Clean Up * Core and pop change. * fixed 1 prov name, lol * Update region.txt * Lenin is Young Once Again * fix * Update positions.txt * meuse/maas was wrong * Developer build (#46) * Core and pop change. * fixed 1 prov name, lol * Update region.txt * Lenin is Young Once Again * fix * Update positions.txt * meuse/maas was wrong Co-authored-by: RedstoneCobra <[email protected]> Co-authored-by: Hammonia <[email protected]> Co-authored-by: JmanThunder <[email protected]> * Update countries.txt * Merge pull request #64 from rderekp/master (#47) * POP fix * POP fix (#48) Co-authored-by: JmanThunder <[email protected]> * fix prov name * nemunas/memel fix * Update map-provinces.csv * pops change * Map changes, take note. Balkans! * San Stefano borders * fixed broken turkish pops * Delete CounterRevolution.txt * Developer build (#49) * POP fix * fix prov name * nemunas/memel fix * Update map-provinces.csv * pops change * Map changes, take note. Balkans! * San Stefano borders * fixed broken turkish pops * Delete CounterRevolution.txt Co-authored-by: JmanThunder <[email protected]> Co-authored-by: RedstoneCobra <[email protected]> Co-authored-by: Hammonia <[email protected]> * Developer build (#50) * POP fix * fix prov name * nemunas/memel fix * Update map-provinces.csv * pops change * Map changes, take note. Balkans! * San Stefano borders * fixed broken turkish pops * Delete CounterRevolution.txt Co-authored-by: JmanThunder <[email protected]> Co-authored-by: RedstoneCobra <[email protected]> Co-authored-by: Hammonia <[email protected]> * Update decisions-rename.csv * Decision Consolidation * Developer build (#51) * POP fix * fix prov name * nemunas/memel fix * Update map-provinces.csv * pops change * Map changes, take note. Balkans! * San Stefano borders * fixed broken turkish pops * Delete CounterRevolution.txt Co-authored-by: JmanThunder <[email protected]> Co-authored-by: RedstoneCobra <[email protected]> Co-authored-by: Hammonia <[email protected]> * Fix Missing Countries * minor macedonian changes * Update PuppetStates.txt * Balkan terrain changes. * Update provinces.bmp * minor changes * Revert "Delete CounterRevolution.txt" This reverts commit 0c38b86. * Developer build (#52) * POP fix * fix prov name * nemunas/memel fix * Update map-provinces.csv * pops change * Map changes, take note. Balkans! * San Stefano borders * fixed broken turkish pops * Delete CounterRevolution.txt * minor macedonian changes * Update PuppetStates.txt * Balkan terrain changes. * Update provinces.bmp * minor changes * Revert "Delete CounterRevolution.txt" This reverts commit 0c38b86. Co-authored-by: JmanThunder <[email protected]> Co-authored-by: RedstoneCobra <[email protected]> Co-authored-by: Hammonia <[email protected]> * More Decision & Localisation FIxes * Reverse changes * Developer build (#53) * POP fix * fix prov name * nemunas/memel fix * Update map-provinces.csv * pops change * Map changes, take note. Balkans! * San Stefano borders * fixed broken turkish pops * Delete CounterRevolution.txt * minor macedonian changes * Update PuppetStates.txt * Balkan terrain changes. * Update provinces.bmp * minor changes * Revert "Delete CounterRevolution.txt" This reverts commit 0c38b86. Co-authored-by: JmanThunder <[email protected]> Co-authored-by: RedstoneCobra <[email protected]> Co-authored-by: Hammonia <[email protected]> * Localisation fixes * Delete map-provinces.csv * Delete countries-names.csv * cultural colour changes * Update ENG_oob.txt * Event Consolidation * Fixing Province Name Changes Pt. 1 * Update 00_map-provinces.csv * Ingria Flagpack 1. clear - izhorian national flag 2. commie - imaginative ingria ssr 3. fascist - cross with pagan symbol 4. crown - ingria flag with darker blue 5. republic - ingria flag * Cleaning up Renaming Decisions * Developer build (#54) * POP fix * fix prov name * nemunas/memel fix * Update map-provinces.csv * pops change * Map changes, take note. Balkans! * San Stefano borders * fixed broken turkish pops * Delete CounterRevolution.txt * minor macedonian changes * Update PuppetStates.txt * Balkan terrain changes. * Update provinces.bmp * minor changes * Revert "Delete CounterRevolution.txt" This reverts commit 0c38b86. * Delete map-provinces.csv * Delete countries-names.csv * cultural colour changes * Update 00_map-provinces.csv * Ingria Flagpack 1. clear - izhorian national flag 2. commie - imaginative ingria ssr 3. fascist - cross with pagan symbol 4. crown - ingria flag with darker blue 5. republic - ingria flag Co-authored-by: JmanThunder <[email protected]> Co-authored-by: RedstoneCobra <[email protected]> Co-authored-by: Hammonia <[email protected]> Co-authored-by: vjwua <[email protected]> * More Culture colour changes * Update 00_map-provinces.csv * More cultural changes * Trimmed Regions Localisations * Developer build (#55) * POP fix * fix prov name * nemunas/memel fix * Update map-provinces.csv * pops change * Map changes, take note. Balkans! * San Stefano borders * fixed broken turkish pops * Delete CounterRevolution.txt * minor macedonian changes * Update PuppetStates.txt * Balkan terrain changes. * Update provinces.bmp * minor changes * Revert "Delete CounterRevolution.txt" This reverts commit 0c38b86. * Delete map-provinces.csv * Delete countries-names.csv * cultural colour changes * Update 00_map-provinces.csv * Ingria Flagpack 1. clear - izhorian national flag 2. commie - imaginative ingria ssr 3. fascist - cross with pagan symbol 4. crown - ingria flag with darker blue 5. republic - ingria flag * More Culture colour changes * More cultural changes Co-authored-by: JmanThunder <[email protected]> Co-authored-by: RedstoneCobra <[email protected]> Co-authored-by: Hammonia <[email protected]> Co-authored-by: vjwua <[email protected]> * Renamed the Decisions Again * Update 00_map-provinces.csv * Update region.txt * fixes 1 * caucasus * Rewah is live! * fixes part 2 * minor fixes and culture colour changes * positions fix * Update 00_map-provinces.csv * Developer build (#56) * POP fix * fix prov name * nemunas/memel fix * Update map-provinces.csv * pops change * Map changes, take note. Balkans! * San Stefano borders * fixed broken turkish pops * Delete CounterRevolution.txt * minor macedonian changes * Update PuppetStates.txt * Balkan terrain changes. * Update provinces.bmp * minor changes * Revert "Delete CounterRevolution.txt" This reverts commit 0c38b86. * Delete map-provinces.csv * Delete countries-names.csv * cultural colour changes * Update 00_map-provinces.csv * Ingria Flagpack 1. clear - izhorian national flag 2. commie - imaginative ingria ssr 3. fascist - cross with pagan symbol 4. crown - ingria flag with darker blue 5. republic - ingria flag * More Culture colour changes * More cultural changes * fixes 1 * caucasus * Rewah is live! * fixes part 2 * minor fixes and culture colour changes * positions fix * Update 00_map-provinces.csv Co-authored-by: JmanThunder <[email protected]> Co-authored-by: RedstoneCobra <[email protected]> Co-authored-by: Hammonia <[email protected]> Co-authored-by: vjwua <[email protected]> * Region Name Changes * SOV fix * Update defines.lua * Update region.txt * fix 3 * Trying to merge RUS * Delete RUS.txt * Add files via upload * Add files via upload * Update 00_countries-demonyms.csv * added my name to devs list * Update Renaming-Decisions-Americas.txt * Silly Brackets * Kleinlitauen * Update Renaming-Decisions-Europe.txt * Update 00_map-regions.csv * Update 00_map-regions.csv * Update 00_map-regions.csv * Fixing Crash during Loading History I don't think you can hash out a file. * Update Renaming-Decisions-Europe.txt * Fixed Renaming Decisions and Province Names in Turkey in Europe * Blue macedonia * Decision Clean Up 1 * Decision Cleanup #2 * Decisions CleanUp #3 * Add some pictures, fixed Alaska * industry fix * improved policies * Decisions Cleanup #4 * Localizing C & E European Renaming Decisions * Fixing 2 Kunduz and provinces in two states. * Maxhno Is Young again * Update Supernations.txt * Fixed RUS.txt * Update BEL - Belgium.txt * bosnia border fix * Fixed dup Russian decisions * More typo fixes (#96) * Developer build (#5) * Maxhno Is Young again * Update Supernations.txt * Update BEL - Belgium.txt * bosnia border fix Co-authored-by: JmanThunder <[email protected]> Co-authored-by: Hammonia <[email protected]> * More typos Co-authored-by: JmanThunder <[email protected]> Co-authored-by: Hammonia <[email protected]> * Supernations.txt (#97) * Developer build (#5) * Maxhno Is Young again * Update Supernations.txt * Update BEL - Belgium.txt * bosnia border fix Co-authored-by: JmanThunder <[email protected]> Co-authored-by: Hammonia <[email protected]> * More typos * Update Supernations.txt Co-authored-by: JmanThunder <[email protected]> Co-authored-by: Hammonia <[email protected]> * Merging again (#98) * Developer build (#5) * Maxhno Is Young again * Update Supernations.txt * Update BEL - Belgium.txt * bosnia border fix Co-authored-by: JmanThunder <[email protected]> Co-authored-by: Hammonia <[email protected]> * More typos * Update Supernations.txt Co-authored-by: JmanThunder <[email protected]> Co-authored-by: Hammonia <[email protected]> * No K but C for Germany * Terrain Additions + Localization (#99) * Developer build (#5) * Maxhno Is Young again * Update Supernations.txt * Update BEL - Belgium.txt * bosnia border fix Co-authored-by: JmanThunder <[email protected]> Co-authored-by: Hammonia <[email protected]> * More typos * Update Supernations.txt * New Terrains & Localization Fixes Co-authored-by: JmanThunder <[email protected]> Co-authored-by: Hammonia <[email protected]> * Chile * volga german fix * - * brackets * Update 3377 - Pechory.txt * Update 3376 - Ivanograd.txt * Update event_modifiers.txt * Update USA_Minors.txt * Update defines.lua * promotion fix * fix hopefully * fix pls * Revert "fix pls" This reverts commit b8c1735. * i think this is it * please work * Revert "please work" This reverts commit a36017e. * RRRRRRREEEEEEEEEEEEEEEEEE * YES * yay * Update aristocrats.txt * Caucasian minor changes Co-authored-by: vjwua <[email protected]> Co-authored-by: Hammonia <[email protected]> Co-authored-by: Tunsku6 <[email protected]> Co-authored-by: RedstoneCobra <[email protected]> Co-authored-by: JmanThunder <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.