Jan Dalheimer
f1dc456802
Also reload the instance cfg
...
While this should work, there don't seem to be any places where the signals are listened for, so changes probably will only be available when calling Setting::get
TODO: Fix that ^
2014-03-09 08:43:08 +01:00
Jan Dalheimer
44f21406e9
Some pre/post related stuff
...
Reload the onesix version config after the commands (addresses https://www.pivotaltracker.com/story/show/60360652 )
Add a few more variables and also substitute them in the command (fixes https://www.pivotaltracker.com/story/show/66994828 )
2014-03-09 08:18:50 +01:00
Petr Mrázek
737169d1d3
Merge pull request #134 from MultiMC/feature_groupview
...
Fix another GroupView bug
2014-03-07 15:59:46 +01:00
Jan Dalheimer
cc1de6a649
Fix another GroupView bug
2014-03-07 15:46:56 +01:00
Jan Dalheimer
211a72e144
Fix a GroupView crash that was triggered by the FTB tracking
2014-03-03 19:12:48 +01:00
Petr Mrázek
3133bb3ea0
Fix missing includes in litaloader installer.
2014-02-25 02:15:14 +01:00
Petr Mrázek
acff155624
Merge branch 'feature_screenshots' into integration_json_and_tools
...
Conflicts:
logic/net/URLConstants.h
Resolve issues with multiple definitions of URL constants by moving them to their own object file.
2014-02-25 01:52:58 +01:00
Petr Mrázek
9d4e840a6e
Screenshots: Optimize image loading and memory use, fix list and button layout.
2014-02-25 01:23:33 +01:00
Petr Mrázek
cb5cfe7242
Reorganize all the screenshot files
2014-02-25 00:51:24 +01:00
robotbrain
b1cddb4600
Fix memory leak in system
2014-02-24 17:49:18 -05:00
robotbrain
55e21737dd
Deleting screenshots. Needs fixing.
2014-02-24 17:40:05 -05:00
Jan Dalheimer
da33fa4090
Imgur album creation
2014-02-24 11:30:27 +01:00
Jan Dalheimer
a8811a27f7
Working screenshot upload
2014-02-24 10:34:51 +01:00
Jan Dalheimer
226c1bdae5
Screenshot fixes, move some code around, fix some stuff
2014-02-24 09:34:21 +01:00
Petr Mrázek
49dc9695f5
Merge branch 'fix_json_version' into integration_json_and_tools
...
Conflicts:
logic/OneSixInstance.cpp
logic/OneSixVersionBuilder.cpp
Some fixage. Yay for conflicts.
2014-02-24 02:35:01 +01:00
robotbrain
5e33da258c
Close to finished. Need to fix the upload part. Viewing works (in grayscale)
2014-02-23 19:48:00 -05:00
Petr Mrázek
f7c97efcf3
Merge branch 'feature_profiling' into integration_json_and_tools
2014-02-24 00:29:13 +01:00
Petr Mrázek
e3d2e5fd74
Merge branch 'fix_ftb' into integration_json_and_tools
2014-02-24 00:28:59 +01:00
robotbrain
4a77524b05
Initial stuff. It doesnt work.
2014-02-23 16:14:24 -05:00
Jan Dalheimer
a354e8bfae
Fix MCEdit on OSX
2014-02-21 20:13:12 +01:00
Jan Dalheimer
4883d15262
Copying of FTB instances working again
2014-02-21 19:15:59 +01:00
Jan Dalheimer
f54705e1c5
Don't assume forge for FTB instances. Fix FTB related stuff.
2014-02-21 18:01:06 +01:00
Jan Dalheimer
43881b9cdb
Use FTB's libraries/ and versions/ folders for non-copied instances
2014-02-20 17:06:32 +01:00
Jan Dalheimer
7146724607
New, better, liteloader support
2014-02-19 22:34:17 +01:00
Jan Dalheimer
0b56b5efaf
Instance flags. Currently used for marking instances as broken. Can later be used for badges.
2014-02-17 20:31:50 +01:00
Jan Dalheimer
4e8be668cb
Different error message if it's a launcher version mismatch
2014-02-17 17:46:43 +01:00
Jan Dalheimer
8d0ff99089
Actually remove instances if they fail to load
2014-02-17 17:36:29 +01:00
Jan Dalheimer
549198031d
Check if the json version is one we know how to handle
...
Also some formatting.
2014-02-17 17:19:58 +01:00
Petr Mrázek
16d378687c
Fix some external tool related string sin the settings dialog.
2014-02-16 14:53:03 +01:00
Petr Mrázek
dd2d8f48fa
Nicer way of selecting tool folders and executables
2014-02-16 14:42:44 +01:00
Jan Dalheimer
e4ecc31e07
Links to the tools
2014-02-16 13:02:59 +01:00
Jan Dalheimer
9c87bc6c4b
Restructure
2014-02-16 12:52:35 +01:00
Jan Dalheimer
f26b7dedad
Only show folders that really are worlds
2014-02-16 12:08:39 +01:00
Jan Dalheimer
f5273ae2b1
Merge remote-tracking branch 'origin/feature_profiling' into feature_profiling
2014-02-16 12:06:14 +01:00
Petr Mrázek
1dc34269bd
Fix path selections for tools (settings dialog)
2014-02-16 12:04:26 +01:00
Jan Dalheimer
c608841f77
Attempt to find jvisualvm
2014-02-16 12:00:38 +01:00
Jan Dalheimer
2e64d0308c
Use a combobox instead of a file dialog
2014-02-16 11:56:02 +01:00
Jan Dalheimer
c88c639b8e
Fix for windows and update tool menu after closing settings dialog
2014-02-16 11:49:55 +01:00
Jan Dalheimer
616c372690
Fix more stuff. Detached tools, only MCEdit for now.
2014-02-16 10:46:14 +01:00
Jan Dalheimer
994972bf5d
More fixes.
2014-02-16 09:30:38 +01:00
Jan Dalheimer
82b35b5445
Fix stuff. Make sure different ways of aborting profiling work.
2014-02-16 08:54:52 +01:00
Petr Mrázek
7ceb2cacb1
Fix a few bugs in profilers.
...
* Legacy was launching before the profiler.
* Some clarity changes.
* Report problem with empty strings as profiler paths.
2014-02-16 00:10:45 +01:00
Jan Dalheimer
8219dbf612
Underp. Don't depend on OneSix. Nicer "menu" style choosing.
2014-02-15 22:26:44 +01:00
Jan Dalheimer
3b236483df
Another attempt at fixing windows build
2014-02-15 19:07:01 +01:00
Jan Dalheimer
c0e58fbfb2
Try to be cross-platform
2014-02-15 18:15:41 +01:00
Jan Dalheimer
6f6d912d07
Underp and fix some stuff. Works nicer now.
2014-02-15 15:20:12 +01:00
Jan Dalheimer
efa8e26a3f
Profiler support. Currently JProfiler and JVisualVM are implemented.
2014-02-15 14:19:35 +01:00
Petr Mrázek
5cf599673d
Merge https://github.com/p-schneider/MultiMC5 into develop
2014-02-14 21:00:48 +01:00
Petr Mrázek
65e30aa118
Merge https://github.com/robotbrain/MultiMC5 into develop
2014-02-14 20:59:23 +01:00
Petr Mrázek
a59dbdcb38
Merge https://github.com/max96at/MultiMC5 into develop
2014-02-14 20:58:09 +01:00
