Petr Mrázek
|
e3d2e5fd74
|
Merge branch 'fix_ftb' into integration_json_and_tools
|
2014-02-24 00:28:59 +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 |
|
Petr Mrázek
|
5cf599673d
|
Merge https://github.com/p-schneider/MultiMC5 into develop
|
2014-02-14 21:00:48 +01:00 |
|
Petr Mrázek
|
65e30aa118
|
Merge https://github.com/robotbrain/MultiMC5 into develop
|
2014-02-14 20:59:23 +01:00 |
|
Petr Mrázek
|
a59dbdcb38
|
Merge https://github.com/max96at/MultiMC5 into develop
|
2014-02-14 20:58:09 +01:00 |
|
p-schneider
|
725e6a36bb
|
fixed the destination (href) of the link http://github.com/MultiMC/MultiMC5 in AboutDialog.ui (+German translation)
|
2014-02-14 13:39:00 +01:00 |
|
robotbrain
|
93ee6f9010
|
Fix FTB paths on Windows XP
|
2014-02-13 16:00:51 -05:00 |
|
Petr Mrázek
|
5a0e7877b0
|
Fix groupview issues
* indexAt was using the wrong coordinate system
* model events now trigger a delayed layout update instead of immediate.
|
2014-02-10 00:51:52 +01:00 |
|
Petr Mrázek
|
2f0275c194
|
Fix kitty. Meow.
|
2014-02-09 22:55:44 +01:00 |
|
Petr Mrázek
|
1f218bb8cd
|
Fix template magic in group view.
|
2014-02-09 21:14:34 +01:00 |
|
Petr Mrázek
|
ba401922e1
|
Do not divide by zero when the last group is collapsed.
|
2014-02-09 21:04:00 +01:00 |
|
Petr Mrázek
|
1f6a484cb2
|
Merge branch 'integration_derpstances_groupview' into develop
|
2014-02-09 20:49:48 +01:00 |
|
Petr Mrázek
|
18f532b0d7
|
Visual and scroll behavior changes to groupview
Scroll by rows, not pixels.
Paint the checkboxy thing again! Make0 it behave.
Set the group header height properly.
|
2014-02-09 20:45:18 +01:00 |
|
Petr Mrázek
|
0d30a2655f
|
Blacklist the FTB voxel pack.
|
2014-02-09 19:10:56 +01:00 |
|
Petr Mrázek
|
9022042360
|
Only load instance list twice.
|
2014-02-09 11:00:34 +01:00 |
|
Petr Mrázek
|
583786757a
|
Fix crash bug related to messageboxes interrupting model resets in the instance list.
|
2014-02-08 23:52:15 +01:00 |
|
Petr Mrázek
|
af33b96684
|
Merge branch 'feature_groupview' into integration_derpstances_groupview
|
2014-02-08 22:18:32 +01:00 |
|
Petr Mrázek
|
aa41b891f0
|
Group View: Use painting code from the previous group headers, small optimizations
|
2014-02-08 21:46:29 +01:00 |
|
Jan Dalheimer
|
53069205fa
|
Allow overriding the order in which patches are applied
|
2014-02-08 17:22:26 +01:00 |
|
Jan Dalheimer
|
6d9819cccf
|
Error if a patch file is for a different version of minecraft
|
2014-02-08 12:47:14 +01:00 |
|
Petr Mrázek
|
f8df07c327
|
Small tweaks to make things better.
|
2014-02-06 09:32:44 +01:00 |
|
Petr Mrázek
|
573d4c8050
|
Paint the headers nicer.
|
2014-02-05 01:34:50 +01:00 |
|
Petr Mrázek
|
c84c51860d
|
Fix crash bug related to data changes in new group view.
|
2014-02-04 21:18:02 +01:00 |
|
Petr Mrázek
|
6206a241ea
|
A try at fixing the instance delegate. A bit. Maybe.
|
2014-02-04 02:01:11 +01:00 |
|
Petr Mrázek
|
7839c4ecc0
|
Pave.
|
2014-02-04 01:40:51 +01:00 |
|
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 |
|