aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml16
-rw-r--r--CMakeLists.txt134
-rw-r--r--MultiMC.cpp6
-rw-r--r--depends/classparser/include/classparser_config.h5
-rw-r--r--depends/classparser/include/javautils.h8
-rw-r--r--depends/classparser/src/annotations.cpp136
-rw-r--r--depends/classparser/src/annotations.h487
-rw-r--r--depends/classparser/src/classfile.h269
-rw-r--r--depends/classparser/src/constants.h374
-rw-r--r--depends/classparser/src/errors.h4
-rw-r--r--depends/classparser/src/javaendian.h54
-rw-r--r--depends/classparser/src/javautils.cpp17
-rw-r--r--depends/classparser/src/membuffer.h105
-rw-r--r--depends/launcher/MCFrame.java163
-rw-r--r--depends/pack200/src/unpack.cpp8
-rw-r--r--depends/settings/include/basicsettingsobject.h16
-rw-r--r--depends/settings/include/inifile.h7
-rw-r--r--depends/settings/include/inisettingsobject.h31
-rw-r--r--depends/settings/include/keyring.h12
-rw-r--r--depends/settings/include/libsettings_config.h14
-rw-r--r--depends/settings/include/overridesetting.h13
-rw-r--r--depends/settings/include/setting.h51
-rw-r--r--depends/settings/include/settingsobject.h77
-rw-r--r--depends/settings/src/basicsettingsobject.cpp8
-rw-r--r--depends/settings/src/inifile.cpp32
-rw-r--r--depends/settings/src/inisettingsobject.cpp10
-rw-r--r--depends/settings/src/overridesetting.cpp6
-rw-r--r--depends/settings/src/setting.cpp9
-rw-r--r--depends/settings/src/settingsobject.cpp66
-rw-r--r--depends/settings/src/stubkeyring.cpp15
-rw-r--r--depends/settings/src/stubkeyring.h11
-rw-r--r--depends/util/CMakeLists.txt17
-rw-r--r--depends/util/include/cmdutils.h77
-rw-r--r--depends/util/include/libutil_config.h15
-rw-r--r--depends/util/include/osutils.h11
-rw-r--r--depends/util/include/pathutils.h15
-rw-r--r--depends/util/include/siglist.h129
-rw-r--r--depends/util/include/siglist_impl.h156
-rw-r--r--depends/util/include/userutils.h8
-rw-r--r--depends/util/src/cmdutils.cpp194
-rw-r--r--depends/util/src/pathutils.cpp35
-rw-r--r--depends/util/src/userutils.cpp82
-rw-r--r--depends/xz-embedded/include/xz.h44
-rw-r--r--depends/xz-embedded/src/xz_config.h35
-rw-r--r--depends/xz-embedded/src/xz_crc32.c8
-rw-r--r--depends/xz-embedded/src/xz_crc64.c8
-rw-r--r--depends/xz-embedded/src/xz_dec_bcj.c148
-rw-r--r--depends/xz-embedded/src/xz_dec_lzma2.c324
-rw-r--r--depends/xz-embedded/src/xz_dec_stream.c207
-rw-r--r--depends/xz-embedded/src/xz_lzma2.h8
-rw-r--r--depends/xz-embedded/src/xz_private.h124
-rw-r--r--depends/xz-embedded/src/xz_stream.h14
-rw-r--r--depends/xz-embedded/xzminidec.c35
-rw-r--r--gui/ConsoleWindow.cpp (renamed from gui/consolewindow.cpp)23
-rw-r--r--gui/ConsoleWindow.h (renamed from gui/consolewindow.h)32
-rw-r--r--gui/ConsoleWindow.ui (renamed from gui/consolewindow.ui)0
-rw-r--r--gui/CustomMessageBox.cpp19
-rw-r--r--gui/CustomMessageBox.h11
-rw-r--r--gui/EditNotesDialog.cpp29
-rw-r--r--gui/EditNotesDialog.h20
-rw-r--r--gui/IconPickerDialog.cpp147
-rw-r--r--gui/IconPickerDialog.h29
-rw-r--r--gui/LabeledToolButton.h22
-rw-r--r--gui/MainWindow.cpp (renamed from gui/mainwindow.cpp)50
-rw-r--r--gui/MainWindow.h (renamed from gui/mainwindow.h)5
-rw-r--r--gui/MainWindow.ui (renamed from gui/mainwindow.ui)0
-rw-r--r--gui/ModEditDialogCommon.cpp41
-rw-r--r--gui/ModEditDialogCommon.h7
-rw-r--r--gui/ModListView.h13
-rw-r--r--gui/Platform.h (renamed from gui/platform.h)7
-rw-r--r--gui/Platform_Other.cpp (renamed from gui/platform_other.cpp)2
-rw-r--r--gui/Platform_X11.cpp (renamed from gui/platform_x11.cpp)2
-rw-r--r--gui/aboutdialog.cpp24
-rw-r--r--gui/aboutdialog.h22
-rw-r--r--gui/dialogs/AboutDialog.cpp37
-rw-r--r--gui/dialogs/AboutDialog.h35
-rw-r--r--gui/dialogs/AboutDialog.ui (renamed from gui/aboutdialog.ui)31
-rw-r--r--gui/dialogs/CopyInstanceDialog.cpp (renamed from gui/CopyInstanceDialog.cpp)20
-rw-r--r--gui/dialogs/CopyInstanceDialog.h (renamed from gui/CopyInstanceDialog.h)0
-rw-r--r--gui/dialogs/CopyInstanceDialog.ui (renamed from gui/CopyInstanceDialog.ui)6
-rw-r--r--gui/dialogs/CustomMessageBox.cpp34
-rw-r--r--gui/dialogs/CustomMessageBox.h26
-rw-r--r--gui/dialogs/EditNotesDialog.cpp42
-rw-r--r--gui/dialogs/EditNotesDialog.h38
-rw-r--r--gui/dialogs/EditNotesDialog.ui (renamed from gui/EditNotesDialog.ui)0
-rw-r--r--gui/dialogs/IconPickerDialog.cpp156
-rw-r--r--gui/dialogs/IconPickerDialog.h48
-rw-r--r--gui/dialogs/IconPickerDialog.ui (renamed from gui/IconPickerDialog.ui)0
-rw-r--r--gui/dialogs/InstanceSettings.cpp (renamed from gui/instancesettings.cpp)50
-rw-r--r--gui/dialogs/InstanceSettings.h50
-rw-r--r--gui/dialogs/InstanceSettings.ui (renamed from gui/instancesettings.ui)13
-rw-r--r--gui/dialogs/LegacyModEditDialog.cpp (renamed from gui/LegacyModEditDialog.cpp)12
-rw-r--r--gui/dialogs/LegacyModEditDialog.h (renamed from gui/LegacyModEditDialog.h)0
-rw-r--r--gui/dialogs/LegacyModEditDialog.ui (renamed from gui/LegacyModEditDialog.ui)4
-rw-r--r--gui/dialogs/LoginDialog.cpp (renamed from gui/logindialog.cpp)120
-rw-r--r--gui/dialogs/LoginDialog.h (renamed from gui/logindialog.h)38
-rw-r--r--gui/dialogs/LoginDialog.ui (renamed from gui/logindialog.ui)5
-rw-r--r--gui/dialogs/LwjglSelectDialog.cpp (renamed from gui/lwjglselectdialog.cpp)26
-rw-r--r--gui/dialogs/LwjglSelectDialog.h (renamed from gui/lwjglselectdialog.h)20
-rw-r--r--gui/dialogs/LwjglSelectDialog.ui (renamed from gui/lwjglselectdialog.ui)0
-rw-r--r--gui/dialogs/ModEditDialogCommon.cpp57
-rw-r--r--gui/dialogs/ModEditDialogCommon.h (renamed from depends/util/include/apputils.h)11
-rw-r--r--gui/dialogs/NewInstanceDialog.cpp (renamed from gui/newinstancedialog.cpp)12
-rw-r--r--gui/dialogs/NewInstanceDialog.h (renamed from gui/newinstancedialog.h)0
-rw-r--r--gui/dialogs/NewInstanceDialog.ui (renamed from gui/newinstancedialog.ui)6
-rw-r--r--gui/dialogs/OneSixModEditDialog.cpp (renamed from gui/OneSixModEditDialog.cpp)43
-rw-r--r--gui/dialogs/OneSixModEditDialog.h (renamed from gui/OneSixModEditDialog.h)0
-rw-r--r--gui/dialogs/OneSixModEditDialog.ui (renamed from gui/OneSixModEditDialog.ui)4
-rw-r--r--gui/dialogs/ProgressDialog.cpp (renamed from gui/ProgressDialog.cpp)29
-rw-r--r--gui/dialogs/ProgressDialog.h (renamed from gui/ProgressDialog.h)46
-rw-r--r--gui/dialogs/ProgressDialog.ui (renamed from gui/ProgressDialog.ui)0
-rw-r--r--gui/dialogs/SettingsDialog.cpp (renamed from gui/settingsdialog.cpp)44
-rw-r--r--gui/dialogs/SettingsDialog.h (renamed from gui/settingsdialog.h)37
-rw-r--r--gui/dialogs/SettingsDialog.ui (renamed from gui/settingsdialog.ui)20
-rw-r--r--gui/dialogs/VersionSelectDialog.cpp (renamed from gui/versionselectdialog.cpp)15
-rw-r--r--gui/dialogs/VersionSelectDialog.h (renamed from gui/versionselectdialog.h)32
-rw-r--r--gui/dialogs/VersionSelectDialog.ui (renamed from gui/versionselectdialog.ui)0
-rw-r--r--gui/instancedelegate.h12
-rw-r--r--gui/instancesettings.h35
-rw-r--r--gui/newmodeditwindow.ui159
-rw-r--r--gui/widgets/InstanceDelegate.cpp (renamed from gui/instancedelegate.cpp)17
-rw-r--r--gui/widgets/InstanceDelegate.h27
-rw-r--r--gui/widgets/LabeledToolButton.cpp (renamed from gui/LabeledToolButton.cpp)16
-rw-r--r--gui/widgets/LabeledToolButton.h37
-rw-r--r--gui/widgets/MCModInfoFrame.cpp (renamed from gui/MCModInfoFrame.cpp)8
-rw-r--r--gui/widgets/MCModInfoFrame.h (renamed from gui/MCModInfoFrame.h)0
-rw-r--r--gui/widgets/MCModInfoFrame.ui (renamed from gui/MCModInfoFrame.ui)0
-rw-r--r--gui/widgets/ModListView.cpp (renamed from gui/ModListView.cpp)15
-rw-r--r--gui/widgets/ModListView.h (renamed from depends/util/src/osutils.cpp)16
-rw-r--r--logic/BaseInstance.cpp140
-rw-r--r--logic/BaseInstance_p.h17
-rw-r--r--logic/BaseUpdate.cpp17
-rw-r--r--logic/BaseUpdate.h13
-rw-r--r--logic/BaseVersion.h9
-rw-r--r--logic/CMakeLists.txt24
-rw-r--r--logic/EnabledItemFilter.cpp27
-rw-r--r--