Commit Graph

3297 Commits

Author SHA1 Message Date
52ff6a4140 Deny april fools outside of first april. 2014-04-01 22:33:15 +02:00
1ef6ec4178 Fix library replace issue 2014-04-01 21:58:15 +02:00
72bc860983 Fix for invalid prelaunch commands 2014-04-01 00:04:26 +02:00
29b00eab31 Fix FTB-related issues 2014-03-31 00:19:43 +02:00
a3c95d9bcc Add a few default java paths on linux 2014-03-30 21:29:44 +02:00
fbc29b6a06 Fix many memory leaks. 2014-03-30 20:11:41 +02:00
e1e1d99102 Fix java checker crash, some memory leaks 2014-03-30 20:11:41 +02:00
Sky
7cb76788bd Try to read 'authorList' in mcmod.info for authors first, fall back to deprecated 'authors' if nothing is found. 2014-03-30 05:17:46 +01:00
20eb5ac3cc Add mention of the config coding fix to the changelog. 2014-03-29 23:19:21 +01:00
5f4a364955 Setting PermGen to 64 will omit the java param 2014-03-29 22:05:53 +01:00
ff9f9dd629 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop 2014-03-29 21:17:37 +01:00
5f7a48a35e Fix issues with badly encoded escape sequences in config files. 2014-03-29 21:16:54 +01:00
Sky
1f677a3325 Tweak changelog 2014-03-29 16:29:38 +00:00
902dc50c87 Merge branch 'release-0.3' into develop 2014-03-29 16:10:09 +01:00
a19aca0648 Update changelog for 0.3 2014-03-29 15:55:19 +01:00
c069147f67 Merge pull request #168 from max96at/patch-1
Add build status to README.md
2014-03-24 19:17:20 +01:00
64ca8be101 Add build status to README.md 2014-03-24 18:39:27 +01:00
f521a925be Add a travis config file 2014-03-24 17:23:52 +01:00
9617326cf8 Raise console window when it's open, but hidden behind other windows. 2014-03-24 01:54:18 +01:00
b60fbf87ab Bump version to 0.3.0 2014-03-23 23:25:55 +01:00
0e6bc97bf3 Set permissions on the accounts.json file so other users can't access it. 2014-03-23 19:22:39 +01:00
4a24ea6c38 Make some more error messages translateable. 2014-03-23 19:07:13 +01:00
a01b1707de Actually start the forge install job. 2014-03-20 21:23:05 +01:00
4901985db6 Finalize version on reload. 2014-03-19 23:23:59 +01:00
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
Sky
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
Sky
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