1705832feb
Merge remote-tracking branch 'origin/feature_notif_65449324' into develop
2014-03-19 22:28:04 +01:00
4623c1b34f
Merge remote-tracking branch 'origin/feature_fix_timeout' into develop
2014-03-19 22:26:50 +01:00
39d3739442
Merge remote-tracking branch 'origin/feature_json_fixes' into develop
2014-03-19 22:26:25 +01:00
26b485d82f
Merge remote-tracking branch 'origin/feature_badges' into develop
2014-03-19 22:25:36 +01:00
919dea0de6
Revert "Better right-click behaviour, context menu on mouse-up instead of mouse down"
...
This reverts commit 00a945d84b59d6469e0c85335dc0ad4067d9f2ab.
NOPE.
2014-03-17 07:48:50 +01:00
c33e5ca62e
Merge pull request #153 from Drayshak/develop
...
Better right-click behaviour, context menu on mouse-up instead of down, fixes #151
2014-03-16 21:04:36 +00:00
00a945d84b
Better right-click behaviour, context menu on mouse-up instead of mouse down
2014-03-16 20:34:30 +00:00
55e4cb6fb5
Allow reseting notifications
2014-03-15 14:35:35 +01:00
4f452d5815
Add a timer for clicking away the notification dialog
2014-03-15 14:18:29 +01:00
a74f3b553a
Remove the timeout for pre/post commands. Fixes #107
2014-03-15 09:02:56 +01:00
ad9b16bd3d
Nicer icons
2014-03-14 22:01:27 +01:00
42a85def60
Get rid of one reloadInstanceVersion
2014-03-14 21:18:17 +01:00
e95619fa67
Pull in BaseInstaller related changes from quickmod
2014-03-14 20:48:57 +01:00
e5b4dee1c0
Move version stuff to the model and reimplement reordering
2014-03-14 19:51:56 +01:00
de2eb3fc54
Fix missing return in ensureDouble()
2014-03-10 20:18:01 +01:00
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
