Commit Graph

Select branches

Hide Pull Requests

develop

feature/artifact_overhaul

feature/fix_huge_icon_problems

feature/jres

feature/limit_filenames_to_ascii

feature/meow

feature/package_installation

feature/reinstate_cf

feature/rename_folders_with_instances

feature/some_instance_delegate_change

feature/version_list_ui_refactor

stable

updater_overhaul

#1

#1

#10

#10

#1007

#1007

#101

#101

#1012

#102

#102

#104

#104

#1042

#105

#105

#1094

#1094

#11

#11

#1101

#112

#112

#113

#113

#114

#114

#119

#119

#12

#12

#1220

#1225

#1259

#1259

#128

#128

#13

#13

#1308

#1308

#1323

#1327

#134

#1359

#137

#137

#138

#138

#1393

#14

#14

#1419

#1419

#142

#142

#1420

#146

#146

#147

#147

#148

#148

#1492

#1492

#1493

#15

#15

#1520

#153

#1532

#1567

#1590

#16

#16

#1610

#1671

#1671

#168

#1685

#1685

#17

#17

#170

#170

#1703

#1708

#1721

#1721

#1749

#1779

#178

#178

#18

#18

#1818

#1818

#182

#182

#1859

#186

#186

#1863

#1869

#187

#187

#1870

#1870

#19

#19

#190

#190

#191

#191

#1911

#192

#192

#1959

#196

#196

#1960

#1960

#1961

#1963

#1969

#1981

#1981

#2

#2

#20

#20

#203

#203

#2041

#2069

#21

#2103

#2103

#2104

#211

#2113

#212

#214

#214

#2171

#2174

#22

#22

#2216

#2220

#2220

#2224

#2224

#2227

#2227

#2231

#225

#225

#2278

#23

#23

#2304

#2327

#2327

#234

#234

#2349

#2349

#235

#235

#2370

#24

#24

#2447

#2459

#248

#2498

#25

#25

#2511

#2532

#2565

#2572

#2573

#2581

#26

#26

#2603

#2651

#2684

#2689

#2690

#2694

#2695

#27

#27

#2703

#2704

#2705

#2706

#2707

#2708

#2709

#2718

#2736

#2740

#275

#2758

#2796

#28

#2803

#2848

#2849

#2864

#2870

#2871

#2872

#29

#2907

#2979

#2990

#2996

#2997

#3

#3

#30

#3046

#3052

#3071

#3081

#3092

#31

#3101

#3103

#3127

#3165

#3169

#3185

#3187

#3195

#32

#3234

#3237

#3239

#3241

#3264

#3268

#3299

#33

#33

#3300

#3311

#3313

#3314

#3360

#3372

#3378

#34

#34

#3400

#3414

#3436

#3438

#3442

#3460

#3463

#3464

#3476

#3478

#3487

#349

#349

#35

#3517

#3524

#3537

#3538

#3556

#3562

#3564

#3580

#3582

#3583

#3592

#3593

#3594

#3595

#3596

#3597

#36

#36

#360

#3606

#3623

#363

#363

#3632

#3646

#3648

#3649

#3653

#3677

#368

#368

#3680

#3681

#3682

#3684

#3686

#3690

#3691

#3715

#3728

#3729

#3735

#374

#3747

#3760

#3787

#3803

#3804

#3805

#3819

#3825

#383

#3831

#3833

#3835

#384

#3843

#3851

#387

#3870

#3872

#3874

#3875

#3877

#3880

#3881

#3886

#3888

#3893

#3894

#3896

#3897

#3903

#3914

#3919

#3925

#3931

#3951

#3952

#3956

#3958

#3961

#3965

#3970

#3971

#3983

#3997

#4

#4

#400

#400

#4002

#4017

#4048

#4054

#4060

#4076

#4076

#4080

#4085

#4085

#409

#4100

#4103

#4106

#411

#411

#4117

#412

#4135

#4143

#4144

#4168

#4172

#4173

#4177

#4178

#4184

#4186

#4193

#4194

#4197

#4221

#4229

#4230

#4231

#4233

#4234

#425

#4254

#4255

#4256

#4283

#4285

#4295

#43

#43

#4300

#4321

#4327

#4330

#4336

#4345

#4348

#4351

#4354

#4364

#4367

#4373

#4379

#4392

#4394

#4396

#4404

#4428

#4447

#4457

#4461

#4475

#4477

#4477

#4480

#4496

#4526

#4529

#4553

#4553

#4599

#4599

#4609

#4637

#4648

#4653

#4662

#4664

#4671

#4691

#4692

#4706

#4714

#4718

#473

#4733

#4796

#4808

#4816

#4822

#4828

#4830

#4841

#4842

#4844

#4845

#488

#488

#4891

#4911

#4912

#4916

#4928

#4929

#4943

#4946

#4947

#4948

#4964

#497

#4971

#4971

#498

#4985

#499

#499

#4998

#5

#5

#500

#500

#5032

#504

#5052

#5055

#5056

#5058

#5059

#5060

#5063

#5108

#5124

#5125

#5157

#5162

#5163

#5165

#5201

#5201

#5226

#523

#5253

#5284

#5286

#5304

#5315

#5323

#5360

#5360

#5365

#5367

#5378

#5379

#5380

#5389

#5420

#5430

#5431

#5458

#5481

#550

#550

#561

#592

#592

#597

#6

#6

#606

#607

#607

#61

#61

#627

#627

#638

#638

#7

#7

#707

#72

#72

#765

#768

#768

#78

#78

#781

#792

#792

#8

#8

#861

#889

#889

#9

#9

#931

#941

#973

#98

#98

#990

#996

#996

0.0

0.1

0.1.1

0.2

0.2.1

0.3

0.3.1

0.3.2

0.3.3

0.3.4

0.3.5

0.3.6

0.3.7

0.3.9

0.4

0.4.1

0.4.10

0.4.11

0.4.3

0.4.4

0.4.5

0.4.6

0.4.7

0.4.8

0.4.9

0.5.0

0.5.1

0.5.2

0.5.2-final

0.6.0

0.6.1

0.6.10

0.6.11

0.6.12

0.6.13

0.6.14

0.6.15

0.6.16

0.6.2

0.6.3

0.6.4

0.6.5

0.6.6

0.6.7

0.6.8

0.6.9

MMC5-tb9

first_release

Mono Color

• b6c310aeb0 Loads of work. Added webkitwidgets as a dependency. Almost works... Jan Dalheimer 2013-11-13 22:26:43 +01:00
• d84b1a91f4 Add abstract base class for Yggdrasil tasks. Andrew 2013-11-13 12:38:28 -06:00
• f6a652f3ae Added YouCompleteMe config to .gitignore Andrew 2013-11-13 12:37:54 -06:00
• 0b9a449399 Fix mainwindow not showing Jan Dalheimer 2013-11-13 19:32:42 +01:00
• b9f7d0e319 Merge remote-tracking branch 'upstream/develop' into quickmod Jan Dalheimer 2013-11-13 19:21:09 +01:00
• 3d84ae0eca First work on quickmodding Jan Dalheimer 2013-11-13 19:16:10 +01:00
• 662b4bc8cb Merge branch 'develop' Petr Mrázek 2013-11-13 00:25:57 +01:00
• 9693a5e6e9 Fix signal derp from previous commit Petr Mrázek 2013-11-13 00:24:49 +01:00
• ee595fb1da Merge branch 'develop' Petr Mrázek 2013-11-12 09:35:53 +01:00
• fdc58bb913 Fix console not staying open on minecraft crash Petr Mrázek 2013-11-12 09:23:39 +01:00
• 962639aa6d Added data structures for Mojang Account. Andrew 2013-11-11 12:59:59 -06:00
• 52e927a6fd Added vim *.swp files to .gitignore Andrew 2013-11-11 12:59:23 -06:00
• 950088bee5 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop Andrew 2013-11-11 11:37:15 -06:00
• 997054a535 Merge branch 'develop' Petr Mrázek 2013-11-11 04:47:09 +01:00
• e611aef0e7 Recover from the bin folder of converted legacy instance being deleted. Petr Mrázek 2013-11-11 04:45:31 +01:00
• b097d2f744 Use the right LWJGL path while creating an instance Petr Mrázek 2013-11-11 03:47:14 +01:00
• ad7c41114f Fix layout margins in console window Petr Mrázek 2013-11-07 22:31:15 +01:00
• 7f89f64656 Merge branch 'master' of https://github.com/02JanDal/MultiMC5 into quickmod Jan Dalheimer 2013-11-07 17:22:29 +01:00
• cc6e9358fe Merge branch 'develop' Petr Mrázek 2013-11-06 21:03:22 +01:00
• 452cc1849f Fix Sourceforge lwjgl version index download. Petr Mrázek 2013-11-06 20:59:44 +01:00
• 7ddc2b6a89 Merge branch 'develop' Sky 2013-11-06 17:02:23 +00:00
• bba4ed5ab2 Open on the correct settings tab Sky 2013-11-06 17:00:02 +00:00
• dd6af4efab Nag for instance specific JVM args too Sky 2013-11-06 01:18:47 +00:00
• 51dee3745f Fix "Auto Login" instance specific setting, tweak UI Sky 2013-11-06 01:01:09 +00:00
• 605423b8e4 Read mcmod.info first, forgeversion.properties second Sky 2013-11-05 23:46:06 +00:00
• 4186623d0d Nuke Travis CI Sky 2013-11-05 21:08:42 +00:00
• 5083a6a809 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop Andrew 2013-11-04 19:58:56 -06:00
• bb7e8985f6 Reformat and (slightly) decruft all the things. Petr Mrázek 2013-11-04 02:53:05 +01:00
• dc3b0fcb2b Merge branch 'develop' Sky 2013-11-03 23:53:31 +00:00
• d6e4fb2971 Implement instance sorting options. Petr Mrázek 2013-11-04 00:11:20 +01:00
• 4466929074 Add instance copying, fix instance creation (with identical names) Petr Mrázek 2013-11-03 21:28:04 +01:00
• 7fdaf5585f Merge cc035727c6623e30f8f3775be4ae3f994803c195 into ab21b6977d023a31960a21ad7b07441ba7f2e223 robotbrain 2013-11-03 11:12:54 -08:00
• ab21b6977d Catch assets index failure Sky 2013-11-03 16:02:59 +00:00
• bade253a1a Added NagUtils, nag people about trying to override JVM memory options Sky 2013-11-03 15:20:26 +00:00
• 406d8511bd Merge branch 'develop' Sky 2013-11-03 10:18:41 +00:00
• 09dc356883 Main window geometry and state saving/reloading Sky 2013-11-03 00:45:25 +00:00
• 8c7f15cefb Revamp Linux build instructions for Qt Creator Sky 2013-10-31 20:28:10 +00:00
• b018aab1e9 Merge branch 'develop' Petr Mrázek 2013-10-31 09:06:42 +01:00
• 8cd6604e40 List available proxies on start Petr Mrázek 2013-10-31 09:03:18 +01:00
• f39a83edc6 Hack for Intel graphics drivers on Windows. Petr Mrázek 2013-10-31 01:39:37 +01:00
• cc035727c6 Update MultiMC.cpp robotbrain 2013-10-30 08:26:30 -04:00
• f941119fbd Merge branch 'develop' Petr Mrázek 2013-10-30 00:56:43 +01:00
• 44823324f9 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop Petr Mrázek 2013-10-29 22:14:57 +01:00
• 946d397cce Customizable folder browsing is same as for the instance folder. Syste Proxy usage. Petr Mrázek 2013-10-29 22:13:42 +01:00
• 511417c4f7 Make ConsoleWindow have Qt::Window flag (adds minimise/maximise buttons to titlebar) Sky 2013-10-29 18:38:11 +00:00
• aab5478ae7 Move "Forget" button to a sane place Sky 2013-10-29 16:49:41 +00:00
• ac4af46aed Don't make LabeledToolButton selectable Sky 2013-10-29 12:47:14 +00:00
• b0ef429786 Add selectable message box helper, use it, make login GUI error label selectable Sky 2013-10-29 12:40:09 +00:00
• f772515a1a Merge remote-tracking branch 'origin/patch-1' into topic_mod_backup robotbrainify 2013-10-28 19:04:59 -04:00
• 04669a1859 Merge remote-tracking branch 'origin/develop' into topic_mod_backup robotbrainify 2013-10-28 18:58:49 -04:00
• 00c844d8d4 Update BaseInstance.cpp robotbrain 2013-10-28 18:28:05 -04:00
• 8b3709dfe7 Update MultiMC.cpp robotbrain 2013-10-28 18:26:06 -04:00
• 5f914b48f4 Update instancesettings.cpp robotbrain 2013-10-28 18:24:36 -04:00
• 2f5c1680bb Update settingsdialog.cpp robotbrain 2013-10-28 18:21:54 -04:00
• f7586dfd95 Update instancesettings.cpp robotbrain 2013-10-28 18:21:21 -04:00
• 3560c656e2 Update ModList.cpp robotbrain 2013-10-28 18:20:43 -04:00
• 43084172de Update MultiMC.cpp robotbrain 2013-10-28 18:19:33 -04:00
• 060fefadce Register global setting robotbrain 2013-10-28 18:18:00 -04:00
• e7e03c2b54 BLIND CODE, BLIND CODE HERE! WHERE IS THE COMPILER!?!?! Petr Mrázek 2013-10-28 22:01:37 +01:00
• 7df667f823 Valgrind-checked early application start Petr Mrázek 2013-10-28 21:50:58 +01:00
• 6ecb833dbf Fix problem with instance list not using the instance folder path Petr Mrázek 2013-10-28 20:55:12 +01:00
• 9b20ab8d9d Update ModList.cpp robotbrain 2013-10-28 15:54:56 -04:00
• 728269caf8 Update settingsdialog.h robotbrain 2013-10-28 15:53:48 -04:00
• 695d9518a3 Update settingsdialog.cpp robotbrain 2013-10-28 15:52:31 -04:00
• 3392c64892 whoops undo robotbrain 2013-10-28 15:50:58 -04:00
• 75a5864c9e include settigns robotbrain 2013-10-28 15:48:11 -04:00
• 1ee9fbbab3 Instance sttigns applied. robotbrain 2013-10-28 08:36:54 -04:00
• ccd6221cf1 Update instancesettings.cpp robotbrain 2013-10-28 08:12:02 -04:00
• 0b9bacad39 Update instancesettings.ui robotbrain 2013-10-28 08:08:21 -04:00
• 36422e7424 Finish settings robotbrain 2013-10-28 08:05:34 -04:00
• 09c01ebf9d settings continued robotbrainify 2013-10-27 17:58:35 -04:00
• 0f6c316105 Fix for folders, prelim config support. robotbrainify 2013-10-27 17:48:06 -04:00
• c6be763523 Copy mod files to central mods dir. robotbrainify 2013-10-27 17:38:39 -04:00
• 34d12b27da Merge remote-tracking branch 'MultiMC/develop' into develop robotbrainify 2013-10-27 17:17:48 -04:00
• c46292c9b1 Merge branch 'develop' Petr Mrázek 2013-10-26 20:23:26 +02:00
• 9233477295 S3 bucket listing support and network code refactors. Petr Mrázek 2013-10-26 19:55:48 +02:00
• 1f28a3b8af Merge branch 'develop' Sky 2013-10-26 11:13:14 +01:00
• c467ebf132 Fix "no windows means MMC exits prematurely" issue Sky 2013-10-26 08:38:21 +01:00
• 0430a2a38f Add assets download status to status bar. Sky 2013-10-26 02:28:50 +01:00
• ba938dd8e2 Fix java detection segfault Petr Mrázek 2013-10-24 01:47:54 +02:00
• c8b84257ae Actually use QJson for Yggdrasil requests Petr Mrázek 2013-10-23 02:08:39 +02:00
• c65bab6efe Respect console options (opening a console at all, automatically closing) Sky 2013-10-22 18:25:10 +01:00
• cf07b90bda Merge branch 'develop' Sky 2013-10-22 05:21:44 +01:00
• 1d2183ea29 Tweak my credits Sky 2013-10-22 04:55:36 +01:00
• 8c899885b1 Merge branch 'develop' Sky 2013-10-21 22:26:37 +01:00
• 867efd53a2 Bugfixes for auto login Sky 2013-10-21 22:08:09 +01:00
• 003fedde01 Implement auto login Sky 2013-10-21 21:25:50 +01:00
• aaf6fe8944 Merge branch 'develop' Sky 2013-10-21 18:24:29 +01:00
• 11813a0621 Merge branch 'feature_skins' into develop Sky 2013-10-21 18:00:30 +01:00
• ce512e1cf2 Clean up skins, remove wrapper, save to accounts/skins Sky 2013-10-21 17:50:45 +01:00
• 33725e30fb Add contributing section to README Sky 2013-10-21 01:20:34 +01:00
• 32ce5c5c02 Local libs that won't get replaced/redownloaded Petr Mrázek 2013-10-20 23:18:40 +02:00
• aca7764afc Ask for java path when hostname changes from the last run. Petr Mrázek 2013-10-20 22:28:31 +02:00
• 681d36b232 First draft of player faces in the login dialog Sky 2013-10-19 06:40:46 +01:00
• be2c7f4515 Change Organization and App name, might invalidate some configs? Add Tak to credits screen MMC5-tb9 Orochimarufan 2013-10-18 19:57:38 +02:00
• b2574542b1 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop Sky 2013-10-18 18:10:41 +01:00
• 709252fe9e Use player username if offline, or "Player" if blank Sky 2013-10-18 18:10:19 +01:00
• dcf58cdf12 Derp - typo in platform_other.cpp Orochimarufan 2013-10-18 19:01:40 +02:00
• 78882ff6b1 Fix MainWindow Icon; Fix WM_CLASS issue; now links QX11Extras and libxcb on linux Orochimarufan 2013-10-18 18:42:41 +02:00
• 205570be32 Support version format 9, fix version-related segfault, (maybe) fix forge lists. Petr Mrázek 2013-10-18 01:00:46 +02:00