clashoflegends
commented
6 years ago this one worked! I'll test later.
On Sat, Feb 24, 2018 at 12:41 PM, Serguei Carrascosa < notifications@github.com> wrote:
No config files inside.
You can view, comment on, or merge this pull request online at:
https://github.com/clashoflegends/counselor/pull/40 Commit Summary
- add lib to path
- Merge remote-tracking branch 'upstream/master'
- Try to resolve conflict
- Merge branch 'master' of https://github.com/clashoflegends/counselor into clashoflegends-master
- Merge branch 'clashoflegends-master'
- Merge pull request #2 from clashoflegends/SplitCommonsToShare
- Merge pull request #3 from clashoflegends/SplitCommonsToShare
- Settings window. First part.
- Merge pull request #4 from clashoflegends/SplitCommonsToShare
- Settings window. Second part, some labels.
- Merge origin/master
- jspinner in settings
- jspinner in settings
- Merge pull request #5 from clashoflegends/master
- Settings window.
- Settings window.
- Settings window.
- Merge remote-tracking branch 'clashoflegends/master'
- Update code to 1.6 compatibility.
- Fusió amb el repository original ClasOfLegends de Moura
- Merge pull request #8 from clashoflegends/master
- Merge pull request #9 from clashoflegends/master
- Enable and disable auto load action and auto load turn
- Merge pull request #10 from clashoflegends/master
- Merge pull request #11 from clashoflegends/master
- Merge pull request #12 from clashoflegends/master
- Fix forecast
- Fix forecast
- Fix forecast
- Fix forecast
- Fix forecast again. I hate git.
- Fix forecast again. I hate git.
- Merge clashoflegends/master
- Merge clashoflegends/master
- Merge clashoflegends/master
- Merge clashoflegends/master
- Merge clashoflegends/master
- Merge clashoflegends/master
- Merge clashoflegends/master
- Merge origin/master
- Merge pull request #14 from clashoflegends/master
- Merge pull request #15 from clashoflegends/master
- Check box to display portraits
- Add panel to display portraits
- Merge pull request #16 from clashoflegends/master
- Merge pull request #17 from clashoflegends/master
- Merge pull request #18 from clashoflegends/master
- Merge branch 'master' of https://github.com/cladwen/counselor
- dispatch manager switch portrait panel
- dispatch manager switch portrait panel
- Merge pull request #19 from clashoflegends/master
- dispatch manager switch portrait panel
- dispatch manager switch portrait panel
- dispatch manager switch portrait panel
- dispatch manager switch portrait panel
- Merge origin/master
- Load images from folder.
- Merge origin/master
- Show ranks under portrait
- Merge origin/master
- Fix window view for linux
- Merge pull request #20 from clashoflegends/master
- Merge pull request #21 from clashoflegends/master
- Try to fix TabPersonagemGui
- Merge pull request #22 from clashoflegends/master
- Default portrait 'blank.jpg' for testing purpuse
- Revert "Default portrait 'blank.jpg' for testing purpuse"
- Revert "Revert "Default portrait 'blank.jpg' for testing purpuse""
- Revert "Revert "Revert "Default portrait 'blank.jpg' for testing purpuse"""
- Revert "- Try to fix TabPersonagemGui"
- Default portrait 'blank.jpg' for testing purpuse
- User choose portraits folder.
- Download portrait file with progress monitor.
- Download portrait file with progress monitor.
- Merge pull request #23 from clashoflegends/master
- Merge branch 'master' of git://github.com/clashoflegends/counselor
- Download portrait file with progress monitor.
- Fix delete zip file after unzip process.
- Merge pull request #25 from clashoflegends/master
- Merge pull request #26 from clashoflegends/master
- Merge pull request #27 from clashoflegends/master
- Merge pull request #28 from clashoflegends/master
- Try to fix the issue with config window in dual monitor.
- Remove config files
- Remove config files. Commit unchecked
- Remove config files. Commit unchecked
- Restore config files to commit 804ed22
- Remove temp files
File Changes
- D properties.config.old https://github.com/clashoflegends/counselor/pull/40/files#diff-0 (77)
- M src/control/SettingsControler.java https://github.com/clashoflegends/counselor/pull/40/files#diff-1 (14)
- M src/control/WorldControler.java https://github.com/clashoflegends/counselor/pull/40/files#diff-2 (2)
- M src/control/services/DownloadPortraitsHttpServiceImpl.java https://github.com/clashoflegends/counselor/pull/40/files#diff-3 (2)
- M src/gui/accessories/DownloadProgressWork.java https://github.com/clashoflegends/counselor/pull/40/files#diff-4 (57)
- M src/gui/accessories/MainSettingsGui.form https://github.com/clashoflegends/counselor/pull/40/files#diff-5 (5)
- M src/gui/accessories/MainSettingsGui.java https://github.com/clashoflegends/counselor/pull/40/files#diff-6 (6)
Patch Links:
- https://github.com/clashoflegends/counselor/pull/40.patch
- https://github.com/clashoflegends/counselor/pull/40.diff
— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/clashoflegends/counselor/pull/40, or mute the thread https://github.com/notifications/unsubscribe-auth/AMJN0NkMv8ptL4kzYJ4rp6j6SiYJxkvaks5tYGX5gaJpZM4SSBDc .
-- GM Team All feedback is appreciated. Join new games at: http://clashlegends.com/ http://clashlegends.com/PbmSite/
No config files inside.