search

Fragjacker / DoW-Mod-Manager

The original repository for the DoW Mod Manager application, which was made for the Dawn of War:tm: series.
MIT License
32 stars 7 forks source link

I merged 1.5 to master branch, refactored some code and upgraded .NET Framework from 4.5 to 4.5.2 #4

Closed IgorTheLight closed 4 years ago

IgorTheLight commented 4 years ago
Fragjacker commented 4 years ago

@IgorTheLight Auto merge is not possible because the README.md file is conflicting. Fix this on your local branch so I can auto merge without conflicts please. Meanwhile I will test the stuff you did so far 👍

IgorTheLight commented 4 years ago

I tried to resolve it. Is it working now? (I added myself to 1.53 changelog. If you don't like it - you may just delete it)

On Sat, May 2, 2020 at 2:00 PM Dennis S. notifications@github.com wrote:

@IgorTheLight https://github.com/IgorTheLight Auto merge is not possible because the README.md file is conflicting. Fix this on your local branch so I can auto merge without conflicts please. Meanwhile I will test the stuff you did so far 👍

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/Fragjacker/DoW-Mod-Manager/pull/4#issuecomment-622935449, or unsubscribe https://github.com/notifications/unsubscribe-auth/APM5F35ZZZQ63RY2HFUPV3TRPP4LHANCNFSM4MXHDMDQ .

IgorTheLight commented 4 years ago

I know why this problem occurred:

On Sat, May 2, 2020 at 2:35 PM Igor Sandu igorthelight@gmail.com wrote:

I tried to resolve it. Is it working now? (I added myself to 1.53 changelog. If you don't like it - you may just delete it)

On Sat, May 2, 2020 at 2:00 PM Dennis S. notifications@github.com wrote:

@IgorTheLight https://github.com/IgorTheLight Auto merge is not possible because the README.md file is conflicting. Fix this on your local branch so I can auto merge without conflicts please. Meanwhile I will test the stuff you did so far 👍

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/Fragjacker/DoW-Mod-Manager/pull/4#issuecomment-622935449, or unsubscribe https://github.com/notifications/unsubscribe-auth/APM5F35ZZZQ63RY2HFUPV3TRPP4LHANCNFSM4MXHDMDQ .

Fragjacker commented 4 years ago

Merged!

Fragjacker commented 4 years ago

@IgorTheLight Also fixed some tiny issues with the README.md file after the merge. Make sure to pull the latest changes just in case.

IgorTheLight commented 4 years ago

Thanks very much! :-) Let me look at what you have... As I was expecting - you now have 1.54 but with README.md from 1.53 (I covered t in my previous e-mail) Nothing scary - just a few changes :-) Just change your README.md in this way: Line 2:

DoW-Mod-Manager-1.54

Line 76-81:

Version 1.54 (by IgorTheLight):

No more surprises - I promise! :-)

On Sat, May 2, 2020 at 2:58 PM Dennis S. notifications@github.com wrote:

@Fragjacker approved this pull request.

@IgorTheLight https://github.com/IgorTheLight I can confirm the merge conflict was resolved as well as the issues that I have reported! I am also fine with adding your name to the changelog, as I am actually quite happy that someone picked this app up and did some fixes to it 😀

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/Fragjacker/DoW-Mod-Manager/pull/4#pullrequestreview-404522388, or unsubscribe https://github.com/notifications/unsubscribe-auth/APM5F37XIUYCRPWAJOVX45LRPQDFBANCNFSM4MXHDMDQ .

IgorTheLight commented 4 years ago

It looks ALMOST perfect now! Just a small adjustment to README.md:

Changelogs

Version 1.54 (by IgorTheLight):

Version 1.53 (by IgorTheLight):

On Sat, May 2, 2020 at 3:05 PM Igor Sandu igorthelight@gmail.com wrote:

Thanks very much! :-) Let me look at what you have... As I was expecting - you now have 1.54 but with README.md from 1.53 (I covered t in my previous e-mail) Nothing scary - just a few changes :-) Just change your README.md in this way: Line 2:

DoW-Mod-Manager-1.54

Line 76-81:

Version 1.54 (by IgorTheLight):

  • I did all the changes that I found in article "High DPI support in Windows Forms" written by Microsoft
  • Upgraded .NET Framework from 4.5.2 to 4.7.2
  • Added DPIAwareness is app.config
  • Uncommented Windows 10 support in app.manifest

No more surprises - I promise! :-)

On Sat, May 2, 2020 at 2:58 PM Dennis S. notifications@github.com wrote:

@Fragjacker approved this pull request.

@IgorTheLight https://github.com/IgorTheLight I can confirm the merge conflict was resolved as well as the issues that I have reported! I am also fine with adding your name to the changelog, as I am actually quite happy that someone picked this app up and did some fixes to it 😀

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/Fragjacker/DoW-Mod-Manager/pull/4#pullrequestreview-404522388, or unsubscribe https://github.com/notifications/unsubscribe-auth/APM5F37XIUYCRPWAJOVX45LRPQDFBANCNFSM4MXHDMDQ .

IgorTheLight commented 4 years ago

About Mod Manager - I used it from version 1.2 and liked it very much. And still do! Now it's even better! I hope I didn't introduce any new "unexpected behaviors" :-)

P.S. Just don't forget to update README.md then I will sync with your version.

On Sat, May 2, 2020 at 2:58 PM Dennis S. notifications@github.com wrote:

@Fragjacker approved this pull request.

@IgorTheLight https://github.com/IgorTheLight I can confirm the merge conflict was resolved as well as the issues that I have reported! I am also fine with adding your name to the changelog, as I am actually quite happy that someone picked this app up and did some fixes to it 😀

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/Fragjacker/DoW-Mod-Manager/pull/4#pullrequestreview-404522388, or unsubscribe https://github.com/notifications/unsubscribe-auth/APM5F37XIUYCRPWAJOVX45LRPQDFBANCNFSM4MXHDMDQ .

Fragjacker commented 4 years ago

@IgorTheLight Updated the readme file now proper. Also welcome to Github 😀 ! We're all here to learn something new everyday 😁 . Glad you like my Mod Manager as well! I also tested it and it worked all proper so far, no new bugs introduced that weren't there in the first place 😬 .

IgorTheLight commented 4 years ago

Nice! Thank you for your patience :-) If I could do something useful with it - I will let you know!

On Sat, May 2, 2020 at 4:38 PM Dennis S. notifications@github.com wrote:

@IgorTheLight https://github.com/IgorTheLight Updated the readme file now proper. Also welcome to Github 😀 ! We're all here to learn something new everyday 😁 . Glad you like my Mod Manager as well! I also tested it and it worked all proper so far, no new bugs introduced that weren't there in the first place 😬 .

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/Fragjacker/DoW-Mod-Manager/pull/4#issuecomment-622955142, or unsubscribe https://github.com/notifications/unsubscribe-auth/APM5F36EO3HKAQYRPQYCIKDRPQO5RANCNFSM4MXHDMDQ .