0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,009 Commits 1 Branch 0 Tags 29 MiB
94cb5c7d77
Commit Graph

1009 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Petr Mrázek
b82eb5873e Add 'depends/groupview/' from commit '946d49675cb4725c31ab49a51f3bcae302f89a19' 
git-subtree-dir: depends/groupview
git-subtree-mainline: a17caba2c9
git-subtree-split: 946d49675c
 2014-02-04 00:53:05 +01:00
Petr Mrázek
a17caba2c9 Nuke. 2014-02-04 00:43:18 +01:00
Petr Mrázek
946d49675c Swap things around -- rename refactors, moving towards non-derpy design. Maybe. 2014-02-04 00:40:10 +01:00
Jan Dalheimer
ac2f64f337 Reload version after removing custom.json 2014-02-03 20:42:04 +01:00
Petr Mrázek
ddedd077b6 Oh my. 2014-02-02 18:30:52 +01:00
Petr Mrázek
2cd9b06476 Fix drag&drop pixmap rendering 2014-02-02 16:57:00 +01:00
Petr Mrázek
eb0ed082d8 Fix group mouse interaction issues 2014-02-02 14:27:43 +01:00
Jan Dalheimer
cdd35910c3 Fix installing forge after liteloader and then removing liteloader. Also formatting. 2014-02-02 14:17:44 +01:00
Jan Dalheimer
ece826bdbc Add a MMC-depend field (soft/hard) for version checking 2014-02-02 14:05:07 +01:00
Petr Mrázek
b2bf50a6d7 Small tweaks 2014-02-02 10:26:38 +01:00
Jan Dalheimer
790402bdce Disable anything related to user.json for now. Will be re-enabled once we have a gui for it. 2014-02-01 22:32:48 +01:00
Jan Dalheimer
983a40698c Merge remote-tracking branch 'upstream/feature_derpstances' into feature_derpstances 2014-02-01 19:58:13 +01:00
Jan Dalheimer
866d7029af Fix some bugs that got uncovered while trying to get liteloader 1.7 to work 2014-02-01 19:42:47 +01:00
Petr Mrázek
1936bd181f Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 into feature_derpstances 
Conflicts:
	gui/dialogs/OneSixModEditDialog.cpp
	logic/OneSixUpdate.cpp
 2014-02-01 19:37:16 +01:00
Jan Dalheimer
8637cce433 Fix a bug 2014-02-01 16:26:38 +01:00
Jan Dalheimer
4a9e213238 Change the OneSix library view. It now shows a list of patches. 2014-02-01 14:52:21 +01:00
Petr Mrázek
179451d591 More reformat. 2014-01-31 22:58:57 +01:00
Petr Mrázek
3fb7a0faf0 Reformat, Rename, Redo 2014-01-31 22:51:45 +01:00
Petr Mrázek
b4b6091372 Add 'empty text' to all the version selection dialogs. 
Customize it for the Forge one so people finally shut up about 1.7.4
 2014-01-29 01:20:19 +01:00
Jan Dalheimer
556d8f0ec1 custom.json overrides all. For user patching there now is instance.json 2014-01-28 07:39:43 +01:00
Jan Dalheimer
986141b503 Fix library ordering 2014-01-27 22:23:07 +01:00
Jan Dalheimer
176783c8ca Have the libraries tab show tweaker mods instead of libraries 2014-01-27 20:17:29 +01:00
Jan Dalheimer
f9ea3dbfde Split parsing/applying. Better error logging. Fix crash. 2014-01-27 19:20:07 +01:00
Petr Mrázek
ffbc5bb62c Offline mode can be used even when online. 
Allow the user to pick a player name for offline mode.
Big auth refactor. Now using session objects instead of the accounts themselves.
Sessions only last for one instance start and hold all the auth and player data.
 2014-01-27 03:00:49 +01:00
Jan Dalheimer
966f9d1206 Merge branch 'develop' into feature_derpstances 2014-01-24 22:00:34 +01:00
Jan Dalheimer
0f7b38c76b Fix some stuff 2014-01-24 18:17:26 +01:00
Jan Dalheimer
7d5787025a Change naming from Derp -> OneSix until the new instance type supports legacy 2014-01-24 18:12:02 +01:00
Jan Dalheimer
156bc8f276 Forge works now too, and so does forge+liteloader 2014-01-23 21:31:41 +01:00
Petr Mrázek
d7113de3bd Hotfix 0.2.1 for twitch. 
Add to the changelog and tweak the version number.
 2014-01-22 22:40:17 +01:00
Jan Dalheimer
c39d26f445 Got liteloader working. Patching more or less works 2014-01-22 22:15:50 +01:00
Noah Mayr
2831ca94f8 Added more possible java paths on OSX. 2014-01-22 18:28:56 +01:00
Jan Dalheimer
0a592ab99b Work towards liteloader support. Fix creating new instance 2014-01-22 15:20:48 +01:00
Jan Dalheimer
d166b48072 Merge branch 'develop' into feature_derpstances 2014-01-22 14:06:58 +01:00
Jan Dalheimer
13ac46bc18 Fix launching 2014-01-22 14:06:32 +01:00
Jan Dalheimer
a1a06cc89f Derpstances. Everything renamed. Launching does not yet work. 2014-01-22 07:33:32 +01:00
Petr Mrázek
c46c508fc6 Extract native libs in the launcher part. 2014-01-22 02:20:09 +01:00
Petr Mrázek
b182f12c20 Fix library path for 64bit natives 2014-01-21 00:50:18 +01:00
Petr Mrázek
222d3c0dc5 Merge branch 'release-0.2' 2014-01-20 01:32:38 +01:00
Petr Mrázek
3a3c9ac951 Update the changelog, version, scale the instance icon 2014-01-20 01:14:11 +01:00
Petr Mrázek
130a790807 Merge branch 'patch-1' of https://github.com/ACGaming/MultiMC5 into develop 2014-01-19 23:50:37 +01:00
Petr Mrázek
5eb9ef5d56 Scale faces to 64x64 2014-01-19 23:05:16 +01:00
Petr Mrázek
e9ed4b29bc Add 64x64 icon versions 2014-01-19 22:07:59 +01:00
ACGaming
58741d2df4 Complete revision of the German language file 2014-01-19 17:38:26 +01:00
Petr Mrázek
53f61bea71 Remove 24x24 icons :< 2014-01-19 15:16:32 +01:00
Petr Mrázek
498bb48338 Add more scales to toolbar icons 2014-01-19 13:52:44 +01:00
Petr Mrázek
2fe033c4a0 Move a bunch of resources into the resources folder. 
Also, cat is no longer mysterious. It's just FLUFFY!
 2014-01-19 05:21:09 +01:00
Petr Mrázek
d8413fa5ec Use icon theme so we can have more than one icon size per icon 2014-01-19 04:52:34 +01:00
Sky
e6ab57b8b1 Try to improve status arrows a bit 2014-01-19 01:33:32 +00:00
Petr Mrázek
e71295d760 Force using LF endlines while configuring tests 2014-01-18 22:51:04 +01:00
Petr Mrázek
50c441a773 Merge branch 'fix_tests' of https://github.com/02JanDal/MultiMC5 into develop 2014-01-18 22:30:36 +01:00