0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • d11f10ea1e Fix a compiling error by adding noexcept Jan Dalheimer 2014-03-10 18:55:54 +01:00
  • 73fc9c79cf Instance badges. Some easter eggs and one for broken so far. Jan Dalheimer 2014-03-10 17:38:27 +01:00
  • 5328cc7bbe Add missing include for math.h Petr Mrázek 2014-03-10 00:14:30 +01:00
  • b77f4eb144 Merge remote-tracking branch 'origin/feature_paste_66994990' into integration_butchery Petr Mrázek 2014-03-10 00:01:41 +01:00
  • df89183c10 Merge remote-tracking branch 'origin/fix_ftb_again' into integration_butchery Petr Mrázek 2014-03-09 23:59:47 +01:00
  • d18b97ae3d Merge remote-tracking branch 'origin/feature_fix_log' into integration_butchery Petr Mrázek 2014-03-09 23:59:30 +01:00
  • 7fd56a30bd Merge remote-tracking branch 'origin/feature_commands' into integration_butchery Petr Mrázek 2014-03-09 23:46:46 +01:00
  • b2c803a378 Improve reporting of version file errors.x Petr Mrázek 2014-03-09 23:42:25 +01:00
  • ffff2cd324 Remove version patch reordering. Remove the main class display from onesix edit mods. Petr Mrázek 2014-03-09 17:38:42 +01:00
  • f1dc456802 Also reload the instance cfg Jan Dalheimer 2014-03-09 08:43:08 +01:00
  • 44f21406e9 Some pre/post related stuff Jan Dalheimer 2014-03-09 08:18:50 +01:00
  • 91faaa5b59 Fix logging when system language is not en_US. robotbrain 2014-03-07 19:44:15 -05:00
  • 96ee20072f Add project files I use to gitignore. robotbrain 2014-03-07 10:37:57 -05:00
  • 0cc682c629 Fix a few paste upload bugs Jan Dalheimer 2014-03-07 16:15:38 +01:00
  • 737169d1d3 Merge pull request #134 from MultiMC/feature_groupview Petr Mrázek 2014-03-07 15:59:46 +01:00
  • cc1de6a649 Fix another GroupView bug Jan Dalheimer 2014-03-07 15:46:56 +01:00
  • 6e964acde5 Use a constant for the buffer size. robotbrain 2014-03-05 16:35:35 -05:00
  • bb6894893d Fix it - it did it even if the op failed. robotbrain 2014-03-05 16:27:18 -05:00
  • 97ad7d287c Use windows api to prevent encoding problems. robotbrain 2014-03-05 16:20:45 -05:00
  • 47bc7e5ee3 More refactor. Petr Mrázek 2014-03-05 01:50:05 +01:00
  • a4779d32b6 Fix ftb locations on old windows... again. robotbrain 2014-03-03 17:22:23 -05:00
  • 6b76af116e Merge branch 'develop' into feature_version_json_butchery Petr Mrázek 2014-03-03 21:57:45 +01:00
  • 211a72e144 Fix a GroupView crash that was triggered by the FTB tracking Jan Dalheimer 2014-03-03 19:12:48 +01:00
  • 011ea84530 Fix missed version file assignment. Petr Mrázek 2014-03-03 09:08:32 +01:00
  • d66f2500a6 No end in sight :< Petr Mrázek 2014-03-03 01:44:07 +01:00
  • 29cdc9364b More code butchery related to version files. No end in sight. Petr Mrázek 2014-03-03 01:23:10 +01:00
  • 28ad9befdc Remove a lot of error code and error handling madness. Petr Mrázek 2014-03-02 19:12:04 +01:00
  • 80d146866c Remove widgets from logic. Petr Mrázek 2014-03-02 02:17:55 +01:00
  • 5a344a2933 Gather and store liteloader metadata. Petr Mrázek 2014-03-02 02:08:01 +01:00
  • 053b938beb Get rid of parse flags Petr Mrázek 2014-03-02 01:51:40 +01:00
  • 7c24bcc834 Reorganize the version-related code. Petr Mrázek 2014-03-01 23:06:47 +01:00
  • 7dfd6aa051 Remove obsolete OneSixFTBInstanceForge Petr Mrázek 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. Jan Dalheimer 2014-02-25 18:46:50 +01:00
  • 3133bb3ea0 Fix missing includes in litaloader installer. Petr Mrázek 2014-02-25 02:15:14 +01:00
  • acff155624 Merge branch 'feature_screenshots' into integration_json_and_tools Petr Mrázek 2014-02-25 01:52:58 +01:00
  • 9d4e840a6e Screenshots: Optimize image loading and memory use, fix list and button layout. Petr Mrázek 2014-02-25 01:21:46 +01:00
  • cb5cfe7242 Reorganize all the screenshot files Petr Mrázek 2014-02-25 00:51:24 +01:00
  • b1cddb4600 Fix memory leak in system robotbrain 2014-02-24 17:49:18 -05:00
  • 55e21737dd Deleting screenshots. Needs fixing. robotbrain 2014-02-24 17:40:05 -05:00
  • da33fa4090 Imgur album creation Jan Dalheimer 2014-02-24 11:30:27 +01:00
  • a8811a27f7 Working screenshot upload Jan Dalheimer 2014-02-24 10:34:51 +01:00
  • 226c1bdae5 Screenshot fixes, move some code around, fix some stuff Jan Dalheimer 2014-02-24 09:34:21 +01:00
  • 49dc9695f5 Merge branch 'fix_json_version' into integration_json_and_tools Petr Mrázek 2014-02-24 02:35:01 +01:00
  • 5e33da258c Close to finished. Need to fix the upload part. Viewing works (in grayscale) robotbrain 2014-02-23 19:45:59 -05:00
  • f7c97efcf3 Merge branch 'feature_profiling' into integration_json_and_tools Petr Mrázek 2014-02-24 00:29:13 +01:00
  • e3d2e5fd74 Merge branch 'fix_ftb' into integration_json_and_tools Petr Mrázek 2014-02-24 00:28:59 +01:00
  • 4a77524b05 Initial stuff. It doesnt work. robotbrain 2014-02-23 16:14:24 -05:00
  • a354e8bfae Fix MCEdit on OSX Jan Dalheimer 2014-02-21 20:13:12 +01:00
  • 4883d15262 Copying of FTB instances working again Jan Dalheimer 2014-02-21 19:15:59 +01:00
  • f54705e1c5 Don't assume forge for FTB instances. Fix FTB related stuff. Jan Dalheimer 2014-02-21 18:01:06 +01:00
  • 43881b9cdb Use FTB's libraries/ and versions/ folders for non-copied instances Jan Dalheimer 2014-02-20 17:06:32 +01:00
  • 7146724607 New, better, liteloader support Jan Dalheimer 2014-02-19 22:34:17 +01:00
  • 0b56b5efaf Instance flags. Currently used for marking instances as broken. Can later be used for badges. Jan Dalheimer 2014-02-17 20:31:50 +01:00
  • 4e8be668cb Different error message if it's a launcher version mismatch Jan Dalheimer 2014-02-17 17:46:43 +01:00
  • 8d0ff99089 Actually remove instances if they fail to load Jan Dalheimer 2014-02-17 17:36:29 +01:00
  • 549198031d Check if the json version is one we know how to handle Jan Dalheimer 2014-02-17 17:19:58 +01:00
  • 16d378687c Fix some external tool related string sin the settings dialog. Petr Mrázek 2014-02-16 14:53:03 +01:00
  • dd2d8f48fa Nicer way of selecting tool folders and executables Petr Mrázek 2014-02-16 14:42:44 +01:00
  • e4ecc31e07 Links to the tools Jan Dalheimer 2014-02-16 13:02:59 +01:00
  • 9c87bc6c4b Restructure Jan Dalheimer 2014-02-16 12:52:35 +01:00
  • f26b7dedad Only show folders that really are worlds Jan Dalheimer 2014-02-16 12:08:39 +01:00
  • f5273ae2b1 Merge remote-tracking branch 'origin/feature_profiling' into feature_profiling Jan Dalheimer 2014-02-16 12:06:14 +01:00
  • 1dc34269bd Fix path selections for tools (settings dialog) Petr Mrázek 2014-02-16 12:04:26 +01:00
  • c608841f77 Attempt to find jvisualvm Jan Dalheimer 2014-02-16 12:00:38 +01:00
  • 2e64d0308c Use a combobox instead of a file dialog Jan Dalheimer 2014-02-16 11:56:02 +01:00
  • c88c639b8e Fix for windows and update tool menu after closing settings dialog Jan Dalheimer 2014-02-16 11:49:55 +01:00
  • 616c372690 Fix more stuff. Detached tools, only MCEdit for now. Jan Dalheimer 2014-02-16 10:46:14 +01:00
  • 994972bf5d More fixes. Jan Dalheimer 2014-02-16 09:30:38 +01:00
  • 82b35b5445 Fix stuff. Make sure different ways of aborting profiling work. Jan Dalheimer 2014-02-16 08:54:52 +01:00
  • 7ceb2cacb1 Fix a few bugs in profilers. Petr Mrázek 2014-02-16 00:10:45 +01:00
  • 8219dbf612 Underp. Don't depend on OneSix. Nicer "menu" style choosing. Jan Dalheimer 2014-02-15 22:26:44 +01:00
  • 3b236483df Another attempt at fixing windows build Jan Dalheimer 2014-02-15 19:07:01 +01:00
  • c0e58fbfb2 Try to be cross-platform Jan Dalheimer 2014-02-15 18:15:41 +01:00
  • 6f6d912d07 Underp and fix some stuff. Works nicer now. Jan Dalheimer 2014-02-15 15:20:12 +01:00
  • efa8e26a3f Profiler support. Currently JProfiler and JVisualVM are implemented. Jan Dalheimer 2014-02-15 14:19:35 +01:00
  • 5cf599673d Merge https://github.com/p-schneider/MultiMC5 into develop Petr Mrázek 2014-02-14 21:00:48 +01:00
  • 65e30aa118 Merge https://github.com/robotbrain/MultiMC5 into develop Petr Mrázek 2014-02-14 20:59:23 +01:00
  • a59dbdcb38 Merge https://github.com/max96at/MultiMC5 into develop Petr Mrázek 2014-02-14 20:58:09 +01:00
  • 725e6a36bb fixed the destination (href) of the link http://github.com/MultiMC/MultiMC5 in AboutDialog.ui (+German translation) p-schneider 2014-02-14 13:39:00 +01:00
  • 93ee6f9010 Fix FTB paths on Windows XP robotbrain 2014-02-13 16:00:51 -05:00
  • 5a0e7877b0 Fix groupview issues Petr Mrázek 2014-02-10 00:51:52 +01:00
  • 2f0275c194 Fix kitty. Meow. Petr Mrázek 2014-02-09 22:55:44 +01:00
  • 1f218bb8cd Fix template magic in group view. Petr Mrázek 2014-02-09 21:14:34 +01:00
  • ba401922e1 Do not divide by zero when the last group is collapsed. Petr Mrázek 2014-02-09 21:04:00 +01:00
  • 1f6a484cb2 Merge branch 'integration_derpstances_groupview' into develop Petr Mrázek 2014-02-09 20:49:48 +01:00
  • 18f532b0d7 Visual and scroll behavior changes to groupview Petr Mrázek 2014-02-09 20:45:18 +01:00
  • 0d30a2655f Blacklist the FTB voxel pack. Petr Mrázek 2014-02-09 19:10:56 +01:00
  • 9022042360 Only load instance list twice. Petr Mrázek 2014-02-09 11:00:34 +01:00
  • 583786757a Fix crash bug related to messageboxes interrupting model resets in the instance list. Petr Mrázek 2014-02-08 23:52:15 +01:00
  • af33b96684 Merge branch 'feature_groupview' into integration_derpstances_groupview Petr Mrázek 2014-02-08 22:18:32 +01:00
  • aa41b891f0 Group View: Use painting code from the previous group headers, small optimizations Petr Mrázek 2014-02-08 21:46:29 +01:00
  • 53069205fa Allow overriding the order in which patches are applied Jan Dalheimer 2014-02-08 17:22:26 +01:00
  • 6d9819cccf Error if a patch file is for a different version of minecraft Jan Dalheimer 2014-02-08 12:47:14 +01:00
  • f8df07c327 Small tweaks to make things better. Petr Mrázek 2014-02-06 09:32:44 +01:00
  • 573d4c8050 Paint the headers nicer. Petr Mrázek 2014-02-05 01:34:50 +01:00
  • c84c51860d Fix crash bug related to data changes in new group view. Petr Mrázek 2014-02-04 21:18:02 +01:00
  • 6206a241ea A try at fixing the instance delegate. A bit. Maybe. Petr Mrázek 2014-02-04 02:01:11 +01:00
  • 7839c4ecc0 Pave. Petr Mrázek 2014-02-04 01:40:51 +01:00
  • b82eb5873e Add 'depends/groupview/' from commit '946d49675cb4725c31ab49a51f3bcae302f89a19' Petr Mrázek 2014-02-04 00:53:05 +01:00
  • a17caba2c9 Nuke. Petr Mrázek 2014-02-04 00:43:18 +01:00