fcc5bc2ce0
Merge branch 'develop' into feature_badges
...
Conflicts:
logic/OneSixInstance.cpp
2014-03-10 19:24:29 +01:00
d11f10ea1e
Fix a compiling error by adding noexcept
2014-03-10 18:55:54 +01:00
73fc9c79cf
Instance badges. Some easter eggs and one for broken so far.
2014-03-10 17:38:27 +01:00
5328cc7bbe
Add missing include for math.h
2014-03-10 00:14:30 +01:00
b77f4eb144
Merge remote-tracking branch 'origin/feature_paste_66994990' into integration_butchery
2014-03-10 00:01:41 +01:00
df89183c10
Merge remote-tracking branch 'origin/fix_ftb_again' into integration_butchery
2014-03-09 23:59:47 +01:00
d18b97ae3d
Merge remote-tracking branch 'origin/feature_fix_log' into integration_butchery
...
Conflicts:
logic/MinecraftProcess.cpp
2014-03-09 23:59:30 +01:00
7fd56a30bd
Merge remote-tracking branch 'origin/feature_commands' into integration_butchery
2014-03-09 23:46:46 +01:00
b2c803a378
Improve reporting of version file errors.x
2014-03-09 23:42:25 +01:00
ffff2cd324
Remove version patch reordering. Remove the main class display from onesix edit mods.
2014-03-09 17:38:42 +01:00
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
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
91faaa5b59
Fix logging when system language is not en_US.
2014-03-07 19:44:15 -05:00
96ee20072f
Add project files I use to gitignore.
...
Its easier than opening a new pr for it. :P
2014-03-07 10:37:57 -05:00
0cc682c629
Fix a few paste upload bugs
...
Fixes https://www.pivotaltracker.com/story/show/66994990
2014-03-07 16:15:38 +01:00
737169d1d3
Merge pull request #134 from MultiMC/feature_groupview
...
Fix another GroupView bug
2014-03-07 15:59:46 +01:00
cc1de6a649
Fix another GroupView bug
2014-03-07 15:46:56 +01:00
6e964acde5
Use a constant for the buffer size.
2014-03-05 16:35:35 -05:00
bb6894893d
Fix it - it did it even if the op failed.
2014-03-05 16:27:18 -05:00
97ad7d287c
Use windows api to prevent encoding problems.
2014-03-05 16:20:45 -05:00
47bc7e5ee3
More refactor.
2014-03-05 01:50:05 +01:00
a4779d32b6
Fix ftb locations on old windows... again.
2014-03-03 17:22:23 -05:00
6b76af116e
Merge branch 'develop' into feature_version_json_butchery
2014-03-03 21:57:45 +01:00
211a72e144
Fix a GroupView crash that was triggered by the FTB tracking
2014-03-03 19:12:48 +01:00
011ea84530
Fix missed version file assignment.
2014-03-03 09:08:32 +01:00
d66f2500a6
No end in sight :<
2014-03-03 01:44:07 +01:00
29cdc9364b
More code butchery related to version files. No end in sight.
2014-03-03 01:23:10 +01:00
28ad9befdc
Remove a lot of error code and error handling madness.
2014-03-02 19:12:04 +01:00
80d146866c
Remove widgets from logic.
2014-03-02 02:17:55 +01:00
5a344a2933
Gather and store liteloader metadata.
2014-03-02 02:08:01 +01:00
053b938beb
Get rid of parse flags
2014-03-02 01:51:40 +01:00
7c24bcc834
Reorganize the version-related code.
2014-03-01 23:06:47 +01:00
7dfd6aa051
Remove obsolete OneSixFTBInstanceForge
2014-03-01 18:18:51 +01:00
00f4f533aa
Fix to the way translations are handled. Also updated the german translation with the new strings.
2014-02-25 18:46:50 +01:00
3133bb3ea0
Fix missing includes in litaloader installer.
2014-02-25 02:15:14 +01:00
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
9d4e840a6e
Screenshots: Optimize image loading and memory use, fix list and button layout.
2014-02-25 01:23:33 +01:00
cb5cfe7242
Reorganize all the screenshot files
2014-02-25 00:51:24 +01:00
b1cddb4600
Fix memory leak in system
2014-02-24 17:49:18 -05:00
55e21737dd
Deleting screenshots. Needs fixing.
2014-02-24 17:40:05 -05:00
da33fa4090
Imgur album creation
2014-02-24 11:30:27 +01:00
a8811a27f7
Working screenshot upload
2014-02-24 10:34:51 +01:00
226c1bdae5
Screenshot fixes, move some code around, fix some stuff
2014-02-24 09:34:21 +01:00
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
5e33da258c
Close to finished. Need to fix the upload part. Viewing works (in grayscale)
2014-02-23 19:48:00 -05:00
f7c97efcf3
Merge branch 'feature_profiling' into integration_json_and_tools
2014-02-24 00:29:13 +01:00
e3d2e5fd74
Merge branch 'fix_ftb' into integration_json_and_tools
2014-02-24 00:28:59 +01:00
4a77524b05
Initial stuff. It doesnt work.
2014-02-23 16:14:24 -05:00
a354e8bfae
Fix MCEdit on OSX
2014-02-21 20:13:12 +01:00
4883d15262
Copying of FTB instances working again
2014-02-21 19:15:59 +01:00
