Petr Mrázek
39d3739442
Merge remote-tracking branch 'origin/feature_json_fixes' into develop
2014-03-19 22:26:25 +01:00
Petr Mrázek
26b485d82f
Merge remote-tracking branch 'origin/feature_badges' into develop
2014-03-19 22:25:36 +01:00
Jan Dalheimer
42a85def60
Get rid of one reloadInstanceVersion
2014-03-14 21:18:17 +01:00
Jan Dalheimer
e95619fa67
Pull in BaseInstaller related changes from quickmod
2014-03-14 20:48:57 +01:00
Jan Dalheimer
e5b4dee1c0
Move version stuff to the model and reimplement reordering
2014-03-14 19:51:56 +01:00
Petr Mrázek
de2eb3fc54
Fix missing return in ensureDouble()
2014-03-10 20:18:01 +01:00
Jan Dalheimer
fcc5bc2ce0
Merge branch 'develop' into feature_badges
...
Conflicts:
logic/OneSixInstance.cpp
2014-03-10 19:24:29 +01:00
Jan Dalheimer
d11f10ea1e
Fix a compiling error by adding noexcept
2014-03-10 18:55:54 +01:00
Jan Dalheimer
73fc9c79cf
Instance badges. Some easter eggs and one for broken so far.
2014-03-10 17:38:27 +01:00
Petr Mrázek
5328cc7bbe
Add missing include for math.h
2014-03-10 00:14:30 +01:00
Petr Mrázek
b77f4eb144
Merge remote-tracking branch 'origin/feature_paste_66994990' into integration_butchery
2014-03-10 00:01:41 +01:00
Petr Mrázek
d18b97ae3d
Merge remote-tracking branch 'origin/feature_fix_log' into integration_butchery
...
Conflicts:
logic/MinecraftProcess.cpp
2014-03-09 23:59:30 +01:00
Petr Mrázek
7fd56a30bd
Merge remote-tracking branch 'origin/feature_commands' into integration_butchery
2014-03-09 23:46:46 +01:00
Petr Mrázek
b2c803a378
Improve reporting of version file errors.x
2014-03-09 23:42:25 +01:00
Petr Mrázek
ffff2cd324
Remove version patch reordering. Remove the main class display from onesix edit mods.
2014-03-09 17:38:42 +01:00
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
robotbrain
91faaa5b59
Fix logging when system language is not en_US.
2014-03-07 19:44:15 -05:00
Jan Dalheimer
0cc682c629
Fix a few paste upload bugs
...
Fixes https://www.pivotaltracker.com/story/show/66994990
2014-03-07 16:15:38 +01:00
Petr Mrázek
47bc7e5ee3
More refactor.
2014-03-05 01:50:05 +01:00
Petr Mrázek
011ea84530
Fix missed version file assignment.
2014-03-03 09:08:32 +01:00
Petr Mrázek
d66f2500a6
No end in sight :<
2014-03-03 01:44:07 +01:00
Petr Mrázek
29cdc9364b
More code butchery related to version files. No end in sight.
2014-03-03 01:23:10 +01:00
Petr Mrázek
28ad9befdc
Remove a lot of error code and error handling madness.
2014-03-02 19:12:04 +01:00
Petr Mrázek
80d146866c
Remove widgets from logic.
2014-03-02 02:17:55 +01:00
Petr Mrázek
5a344a2933
Gather and store liteloader metadata.
2014-03-02 02:08:01 +01:00
Petr Mrázek
053b938beb
Get rid of parse flags
2014-03-02 01:51:40 +01:00
Petr Mrázek
7c24bcc834
Reorganize the version-related code.
2014-03-01 23:06:47 +01:00
Petr Mrázek
7dfd6aa051
Remove obsolete OneSixFTBInstanceForge
2014-03-01 18:18:51 +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
