CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,612 Commits 10 Branches 30 Tags 34 MiB
ec6204e447
Commit Graph

683 Commits

Author SHA1 Message Date
Petr Mrázek
bb01c91469 NOISSUE do not propagate instance change events when nothing actually changed 2015-05-02 12:11:33 +02:00
Petr Mrázek
32f45578fd NOISSUE fix build issues 
Hopefully all
 2015-05-02 01:43:00 +02:00
Petr Mrázek
aea51a0876 GH-328 overhaul all relevant version lists 2015-05-01 20:50:24 +02:00
Petr Mrázek
f8650e3965 NOISSUE eliminate ProgressProvider 2015-04-26 23:04:50 +02:00
Petr Mrázek
84549ed807 GH-849 Further NetJob related fixes 2015-04-26 18:33:29 +02:00
Petr Mrázek
d5c79db12c GH-849 Fix failure signals not getting delivered from NetJob properly 2015-04-26 04:09:09 +02:00
Petr Mrázek
c7c81463fd GH-885 export dialog for filtering exported files 
Includes implementation of a separator based prefix tree and some related bits
 2015-04-19 16:14:32 +02:00
Petr Mrázek
28aa8f342e GH-887 fix patch file removal 2015-04-13 23:26:52 +02:00
Petr Mrázek
4d8f068f9c NOISSUE refactor and rearrange zip file utils 2015-04-13 00:53:59 +02:00
Petr Mrázek
1f9dd45e49 GH-329 update description text in MainWindow when instance Minecraft version changes 2015-04-13 00:25:55 +02:00
Petr Mrázek
f061bf7a27 NOISSUE use QObjectPtr for translations and screenshots 2015-04-13 00:21:55 +02:00
Petr Mrázek
9df2f1fa5c NOISSUE fix legacy edit instance 2015-04-13 00:15:23 +02:00
Petr Mrázek
fe540e5dda NOISSUE do not fail when updates don't have MultiMC.app prefix on OSX 2015-04-13 00:11:59 +02:00
Petr Mrázek
c7398dfdc5 GH-228 do not recurse into reparse points when deleting instances 2015-04-13 00:06:31 +02:00
Petr Mrázek
0220fe4f9d GH-228 do not follow symlinks during instance copy on unix 
Windows will need a more complex solution.
 2015-04-13 00:06:31 +02:00
Petr Mrázek
58840ac10c NOISSUE fix profilers 2015-04-13 00:04:08 +02:00
Petr Mrázek
47bbc349eb SCRATCH remove more obsolete asset logic 2015-04-12 20:57:18 +02:00
Petr Mrázek
c8687a8d05 NOISSUE get rid of the obsolete version builder 2015-04-12 20:57:18 +02:00
Petr Mrázek
234f57b8e6 NOISSUE Add NullInstance for instances that can't be loaded 2015-04-12 20:57:18 +02:00
Petr Mrázek
db877ba121 NOISSUE move everything. 2015-04-12 20:57:18 +02:00
Petr Mrázek
4730f54df7 SCRATCH separate the generic updater logic from the application 2015-04-12 20:57:17 +02:00
Petr Mrázek
7a71ecd8af NOISSUE fix notification checker 2015-04-12 20:57:17 +02:00
Petr Mrázek
4e94de413b SCRATCH no more gui includes in logic 2015-04-12 20:57:17 +02:00
Petr Mrázek
141e0a02a0 SCRATCH move things to the right places 2015-04-12 20:57:17 +02:00
Petr Mrázek
473971b6e7 NOISSUE fix overlap in instance settings registration 2015-04-12 20:57:17 +02:00
Petr Mrázek
cd9d37aac4 SCRATCH nuke the overcomplicated logger, use a simple one. 2015-04-12 20:57:17 +02:00
Petr Mrázek
28a39ef7ac NOISSUE fix segfault when version list is null 2015-04-12 20:57:17 +02:00
Petr Mrázek
d313e9ab09 SCRATCH remove remaining references to MultiMC.h and fix legacy LWJGL 2015-04-12 20:57:17 +02:00
Petr Mrázek
382ae78a0b Fix NagUtils and hack GroupView to work 2015-04-12 20:57:17 +02:00
Petr Mrázek
aa70ed2244 SCRATCH move icons over to Env, instance proxy model to gui 2015-04-12 20:57:16 +02:00
Petr Mrázek
154d19bb74 SCRATCH eliminate InstanceFactory 2015-04-12 20:57:16 +02:00
Petr Mrázek
8b4e22bbb8 NOISSUE Move FTB logic out of generic code 2015-04-04 15:46:15 +02:00
Petr Mrázek
c7b39fe116 NOISSUE Remove special FTB logic from generic version patch code 2015-04-04 02:01:52 +02:00
Petr Mrázek
865b200571 GH-856 add profile strategy for FTB packs 2015-04-03 11:55:16 +02:00
Petr Mrázek
dc84ac3682 NOISSUE make slightly more compatible with current unstable 
Recognize MinecraftVersion as IntendedVersion
 2015-04-02 22:14:54 +02:00
Petr Mrázek
695bfd5f7c NOISSUE insert blatant self-promotion 2015-04-02 21:56:25 +02:00
Petr Mrázek
5ff2681da6 NOISSUE use QSaveFile for saving patch order 2015-04-02 21:56:25 +02:00
Petr Mrázek
5359f4499a NOISSUE remove obsolete EnabledItemFilter model 2015-04-02 20:22:52 +02:00
Petr Mrázek
9249768db5 NOISSUE Make tests no longer use the MultiMC object 
They do not require the application part anymore
 2015-04-02 11:30:38 +02:00
Petr Mrázek
6f3aa65bd6 NOISSUE Split MultiMC app object into MultiMC and Env 2015-04-02 11:30:24 +02:00
Petr Mrázek
e508728246 NOISSUE remove obsolete assets migration task 2015-04-02 00:37:52 +02:00
Petr Mrázek
791221e923 NOISSUE Refactors and moving of things 2015-04-02 00:14:06 +02:00
Petr Mrázek
593111b144 GH-813 Add 'mcedit2.exe' to the list of things the MCEdit tool looks for 2015-04-01 22:43:18 +02:00
Petr Mrázek
3b6574181e GH-853 evict asset index files from cache when they don't parse 2015-04-01 00:23:17 +02:00
Petr Mrázek
eae544f0eb GH-841 fix for modpack downloads on windows 2015-03-27 02:03:14 +01:00
Petr Mrázek
93b247592d NOISSUE actually make INI file saving work again... oops :P 2015-02-21 08:59:38 +01:00
Petr Mrázek
b8a8b09796 NOISSUE make sure saving config files is atomic 2015-02-21 00:21:19 +01:00
Greenphlem
c6c5134398 Change copyright dates to 2015 2015-02-06 01:18:02 +01:00
Petr Mrázek
e25e076d2e NOISSUE ignore PermGen warnings in log 2015-02-02 21:42:01 +01:00
Petr Mrázek
c6427caa9e GH-734: block more java env variable holes. 2015-01-17 23:05:34 +01:00
Petr Mrázek
55e5322fbe GH-721 Log errors in asset and MMC update downloads. 2015-01-11 22:30:54 +01:00
Petr Mrázek
0886786bb5 GH-721 Redo internal NetJob implementation. 
NetJob is now using its own task queue and does not start more than 6 actions at the same time
 2015-01-11 22:04:31 +01:00
Petr Mrázek
1151037f96 GH-719 Fix paste upload encoding and do not try to upload over limit 2015-01-11 03:08:41 +01:00
robotbrain
acb3346409 NOISSUE Update and sort modlist after adding mods 2015-01-06 21:23:02 +01:00
Petr Mrázek
4db31aacd6 NOISSUE Treat any forge downloads <= 4KB as stale. 2014-12-27 22:45:49 +01:00
Petr Mrázek
a30a9559c7 NOISSUE Fix jar mods for OnesSix 2014-12-27 20:50:33 +01:00
Petr Mrázek
bbcd44a657 NOISSUE Always follow redirects for NetAction based downloads 2014-12-12 00:44:55 +01:00
Petr Mrázek
80d3f734c6 GH-619 Add libraries missing in copies of 1.7.10 FTB packs 2014-11-17 22:01:32 +01:00
Petr Mrázek
a2ac9c5a3a Fix coloring and processing of console output 
* Removing \r
* Adding missing break statements for coloring
 2014-11-10 05:10:58 +01:00
Petr Mrázek
2e9284951c Improve log formatting 
* Updated log level detection for current Minecraft versions
* Better formatting: using a monospaced font and raw text instead of HTML (fixes #111)
 2014-11-09 14:53:08 +01:00
Petr Mrázek
28eebc09fc Give paste upload a nice status message 
Fixes #364
 2014-11-09 02:09:01 +01:00
Petr Mrázek
fa42a27525 Workaround for QTBUG-42500 
Process has to have LD_LIBRARY_PATH set to empty string to not inherit it by default
 2014-11-09 00:19:54 +01:00
Petr Mrázek
84723add8f Fix #537 
Core Mods help now goes to Loader Mods
Fixed Minecraft Log -> Minecraft Logs problem
 2014-11-08 21:47:51 +01:00
Jan Dalheimer
7d1dd2a32f Fix #474: Bad jvisualvm check 2014-11-02 20:29:09 +01:00
Jan Dalheimer
add23a9a0b Fix #220: Use .exe suffix on windows for jprofiler 2014-11-02 20:16:29 +01:00
Jan Dalheimer
d9b2f0ed42 Fix another bunch of copyright years, including fixing #397 2014-11-02 20:08:26 +01:00
Jan Dalheimer
9217d9263e Update copyright year (finally...) 2014-11-02 19:49:58 +01:00
Jan Dalheimer
a3a5afe119 Fix #231: Enable translation for more strings 2014-11-02 19:25:11 +01:00
Petr Mrázek
c1b6f42551 Also block other java-related env vars, for good measure 
"JAVA_ARGS"
"CLASSPATH"
"CONFIGPATH"
"JAVA_HOME"
"JRE_HOME"
 2014-11-02 11:13:18 +01:00
Petr Mrázek
3d1426b559 Filter env variables passed to Minecraft 
QT_* and LD_* are not passed through
env variables are logged on launch
 2014-11-01 14:11:20 +01:00
Petr Mrázek
8f7aec032b Add dark, light, blue and colored theme from pe. 
Replaces the old dark and light themes
 2014-10-26 23:44:20 +01:00
robotbrain
b4122cff89 Fix translation downloading 2014-10-05 11:37:49 -04:00
robotbrain
bbdf5c1395 Translation downloading! 2014-09-30 16:22:39 -04:00
Petr Mrázek
b00e63dbe8 More sync from quickmods 
Also a small VersionSelectDialog refactor
 2014-09-06 21:01:23 +02:00
Petr Mrázek
20cb97a35a Sync from quickmods 2014-09-06 19:03:05 +02:00
Petr Mrázek
febf3645d0 Fix version file problems, fix console window not being destroyed 2014-08-21 00:32:32 +02:00
Petr Mrázek
01ca3d6aad Add some logging to places where version updates might not trigger. 2014-08-21 00:32:32 +02:00
Petr Mrázek
7d8c5ac9b5 Revert "Do not include jutils in LWJGL versions." 
This reverts commit 376467740b.
 2014-08-15 00:02:44 +02:00
Petr Mrázek
376467740b Do not include jutils in LWJGL versions. 2014-08-13 04:44:01 +02:00
Petr Mrázek
814d5d3315 Properly detect if the instance is vanilla and don't treat it as custom. 2014-08-11 02:17:48 +02:00
Petr Mrázek
fd6706391b Increase the java checker timeout from 5s to 15s 2014-08-10 15:13:35 +02:00
Mrazek, Petr
151fbde8d0 Fix loading of Minecraft versions from FTB packs 2014-07-30 06:25:17 -04:00
Petr Mrázek
03b13b0b3f Rearrange RawLibrary and OneSixLibrary heavily. 
Fix #396
 2014-07-26 23:00:35 +02:00
Petr Mrázek
75cb329f17 Check if the java binary can be found before launch. 
Fix #386
 2014-07-23 00:16:31 +02:00
Petr Mrázek
c91adfb3d1 Merge branch 'master' into develop 
Conflicts:
	CMakeLists.txt
	changelog.md
 2014-07-20 14:23:14 +02:00
Petr Mrázek
3403553d44 Fix LWJGL version list loading. 
SourceForge has changed its API again.
 2014-07-20 12:59:44 +02:00
Petr Mrázek
c767707c95 Make forge work. 
Using classifiers FTW.
 2014-07-19 23:16:02 +02:00
Petr Mrázek
8a56ab6780 Implement gradle spec reader/writer 2014-07-16 02:03:52 +02:00
Petr Mrázek
3821569363 Show changelog even when there are no new updates available. 2014-07-14 00:57:54 +02:00
Petr Mrázek
d8d6f5929b Fix #361 2014-07-13 15:26:26 +02:00
Jan Dalheimer
4c0dc51110 Finish of the OtherLogs page, and (re)format page related files 2014-07-12 23:31:06 +02:00
Jan Dalheimer
5c43842359 Add a new page that can show all sorts of logs 2014-07-12 23:31:05 +02:00
Petr Mrázek
6a8984a21d Fix #356 2014-07-11 01:51:07 +02:00
Petr Mrázek
40c238442f Fix #354, make jar mods and patch files in general more resilient. 2014-07-10 01:26:45 +02:00
Petr Mrázek
ff06489fed Do not show core mods page for minecraft newer than 1.5.2. 2014-07-10 00:47:08 +02:00
Petr Mrázek
08fbfa7434 Make the auth timeout longer (30s) 2014-07-09 19:53:35 +02:00
Petr Mrázek
6349800f07 Fix mod list sorting predicate, convert the changelog to markdown and reverse it. 2014-07-08 23:05:33 +02:00
Petr Mrázek
9b3ae29a36 Make the FTB packs a set instead of a list. 2014-07-08 08:42:48 +02:00
Petr Mrázek
f72a38b06c Update the forge hacks. 2014-07-07 08:40:03 +02:00
Petr Mrázek
d934e64831 Tweak the response to successful uploads (screenshots, log pastes) 
The url will now be shown as link, put into the clipboard AND opened in a browser.
At the same time. To avoid losing the URL.
 2014-07-07 00:02:04 +02:00
Petr Mrázek
15775bd30a One more liteloader fix 2014-07-06 23:23:48 +02:00
Petr Mrázek
cc499488db Fix liteloader, some cleanups. 2014-07-06 11:15:15 +02:00
Petr Mrázek
b5d6f50fb1 Make paste.ee logs expire after a month 2014-07-03 20:29:44 +02:00
Petr Mrázek
a75e64dd18 disable that upgrade page 2014-07-03 02:26:00 +02:00
Petr Mrázek
18a342ef14 Move settings lib into the main code, fixing error logging in it. 2014-07-01 01:48:09 +02:00
Petr Mrázek
8b86306d48 Handle a bunch more clang warnings 2014-07-01 01:23:49 +02:00
Taeyeon Mori
b9fb718822 [Clang Warnings] Remove unused variables 2014-06-30 23:53:41 +02:00
Taeyeon Mori
1f498266d8 Fix bug in OneSixInstance's modification detection. 
OneSixInstance would report all instances as custom because of a typo.
Thanks Clang :)
 2014-06-30 23:51:40 +02:00
Petr Mrázek
421a46e3d3 Redo the console window. Log is now a page. Console window has relevant pages. 
Dirty fix for screenshot thumbnail generation. Needs more QTimer.
 2014-06-30 02:02:57 +02:00
Petr Mrázek
828254dd11 ~_~_~_~ 2014-06-28 17:15:53 +02:00
Petr Mrázek
e8731c5d01 Turn screenshot management into a page. 2014-06-28 17:07:08 +02:00
Petr Mrázek
30b1f5e5cf Merge branch 'feature/fix_intel' into develop 
Conflicts:
	CMakeLists.txt
	changelog.yaml
	gui/MainWindow.cpp
 2014-06-28 08:49:18 +02:00
Petr Mrázek
f0d850e1ee Fix issues with intel drivers. Forced java re-detection on Windows. 2014-06-28 00:05:00 +02:00
Petr Mrázek
affb2fdd6c Merge branch 'feature/forge_pre4_fix' into develop 
Conflicts:
	logic/forge/ForgeVersionList.cpp
	logic/forge/ForgeVersionList.h
 2014-06-25 00:54:00 +02:00
Petr Mrázek
c081cd8021 Fix forge prerelease mess. 
This adds a HACK that assumes Mojang will be consistent with their versioning. What could possibly go wrong?
 2014-06-25 00:36:42 +02:00
Petr Mrázek
1194ec9a8e No more disabling of actions in the instance toolbar. It makes no sense. 2014-06-20 01:24:32 +02:00
Petr Mrázek
d911c9908c Replace notes dialog with a page. 2014-06-18 01:15:01 +02:00
Petr Mrázek
c08bfce5f2 More github wiki friendly help page names 2014-06-10 02:05:31 +02:00
Petr Mrázek
9ec6deea84 Add close button to page dialog. Add help button to page dialog. 
Smile.
 2014-06-10 00:46:05 +02:00
Petr Mrázek
0bccc94471 Cleanup - QFileInfo derp and unused variables 2014-06-09 01:57:10 +02:00
Petr Mrázek
171325d427 Instance settings moved to a page. 2014-06-09 01:38:31 +02:00
Petr Mrázek
be73eb3322 Version revert logic improvements, colorful icons for mod lists and resource pack list. 
Icons are from Oxygen.
 2014-06-09 01:38:31 +02:00
Petr Mrázek
bf7b070508 Show texture/resource packs when appropriate. 2014-06-09 01:38:31 +02:00
Petr Mrázek
223a7aba7b Hardcode LWJGL 2.9.1 for OneSix, only allow chancging Minecraft versions for now. 2014-06-09 01:38:31 +02:00
Petr Mrázek
84ae67fff5 Page dialog for legacy instances. 2014-06-09 01:38:31 +02:00
Petr Mrázek
f485885757 Add and implement pages and page dialog. 2014-06-09 01:38:31 +02:00
Petr Mrázek
48d3052ac1 New, simpler and versioned format for the patch load order. 2014-06-09 01:38:31 +02:00
Petr Mrázek
e118b1f990 Implement adding jar mods, break saving library order. 2014-06-09 01:38:31 +02:00
Petr Mrázek
55a0d110b6 Lock down the version cache. Just enough to make it annoying to corrupt the files. 2014-06-09 01:38:31 +02:00
Petr Mrázek
f3900f2966 Reduce startup logging verbosity 2014-06-09 01:38:31 +02:00
Petr Mrázek
db8b47e7f6 Break FTB. Yep. It has to be done better. 2014-06-09 01:38:30 +02:00
Petr Mrázek
439e17b149 Add back legacy mod edit, add checksums for all legacy jars 2014-06-09 01:38:30 +02:00
Petr Mrázek
68ef451be5 Small fixes, including release dates of some legacy versions 2014-06-09 01:38:30 +02:00
Petr Mrázek
e993adaf44 Disable window titles and isons again, windows build fixes 2014-06-09 01:38:30 +02:00
Petr Mrázek
ad1f2c530c Use window icons and titles in 1.6+ 2014-06-09 01:38:30 +02:00
Petr Mrázek
69c3e7111f Make 1.6+ work with new instance format. 2014-06-09 01:38:30 +02:00
Petr Mrázek
92abe4c603 All of the broken legacy things work. 2014-06-09 01:38:30 +02:00
Petr Mrázek
9860d5ee12 Introducing VersionPatch base class for version files and minecraft versions 2014-06-09 01:38:30 +02:00
Petr Mrázek
8a3a0f5a52 Reorganize logic code. 2014-06-09 01:38:30 +02:00
Petr Mrázek
69a9ca39ad Add builtin Minecraft versions for legacy 2014-06-09 01:38:29 +02:00
Petr Mrázek
825d31bf1a Set the window params inside the launcher part, depending on launcher type. 
Also create/change the new internal version files.
 2014-06-09 01:38:29 +02:00
Petr Mrázek
2590c6be15 Fix launcher part for legacy in onesix. 2014-06-09 01:38:29 +02:00
Petr Mrázek
4c3bd416c6 Much change, very jarmod. 2014-06-09 01:38:29 +02:00
Petr Mrázek
aade36860c Begin the transformation! 
Nuke all the things.
 2014-06-09 01:38:29 +02:00
Jan Dalheimer
e1f542b5b0 Still trying to fix FTB 2014-05-23 18:41:22 +02:00
Petr Mrázek
911ac19a56 Screenshot upload dialog(s) now have the console window as parent. 2014-05-18 19:07:01 +02:00
Petr Mrázek
8a8c4193e6 Finish status pills. 2014-05-17 16:23:48 +02:00
Petr Mrázek
cf616efb5d Fix for #257 2014-05-08 19:00:48 +02:00
Jan Dalheimer
0f3d88cb14 Fix FTB local libraries bug 2014-05-03 15:40:46 +02:00
Petr Mrázek
ca60784a44 Add proper FML libs URL 2014-04-21 20:41:37 +02:00
Petr Mrázek
565dab24b5 Download and cache FML libs for legacy minecraft versions. 
* minor fix for version filtering (1.5 no longer shows forge for 1.5.1 and 1.5.2)
* FML libs are downloaded to mods/minecraftforge/libs and cached
* FML libs are copied to instances which contain FML or forge
 2014-04-19 21:24:11 +02:00
Petr Mrázek
b286b93281 Give more feedback for YggdrasilTask network errors. 2014-04-16 00:46:41 +02:00
Petr Mrázek
b6d7ffab47 Detect and report missing local libraries. 2014-04-13 23:06:28 +02:00
Petr Mrázek
482ad250a4 Workaround for dirty build folders. 
My disgust just turned into barely contained rage :<
 2014-04-06 03:59:37 +02:00
Petr Mrázek
f9169654c5 Build fixage for the changed build config 2014-04-06 03:48:59 +02:00
Petr Mrázek
e58e2643ca Merge branch 'patch-1' of https://github.com/max96at/MultiMC5 into develop 2014-04-06 00:41:19 +02:00
Petr Mrázek
42e305bb9d Get rid of long rebuilds because of minor cmake config changes 2014-04-06 00:33:33 +02:00
max96at
8594cc8f6c Fix adding icons to custom icon directories. 2014-04-03 19:28:23 +02:00
Petr Mrázek
ad9d082f57 Do not spam logs too much, bump version and add to changelog. 2014-04-01 23:03:04 +02:00
Petr Mrázek
52ff6a4140 Deny april fools outside of first april. 2014-04-01 22:33:15 +02:00
Petr Mrázek
1ef6ec4178 Fix library replace issue 2014-04-01 21:58:15 +02:00
Petr Mrázek
72bc860983 Fix for invalid prelaunch commands 2014-04-01 00:04:26 +02:00
Petr Mrázek
29b00eab31 Fix FTB-related issues 2014-03-31 00:19:43 +02:00
Petr Mrázek
a3c95d9bcc Add a few default java paths on linux 2014-03-30 21:29:44 +02:00
Petr Mrázek
fbc29b6a06 Fix many memory leaks. 2014-03-30 20:11:41 +02:00
Petr Mrázek
e1e1d99102 Fix java checker crash, some memory leaks 2014-03-30 20:11:41 +02:00
Sky
7cb76788bd Try to read 'authorList' in mcmod.info for authors first, fall back to deprecated 'authors' if nothing is found. 2014-03-30 05:17:46 +01:00
Petr Mrázek
5f4a364955 Setting PermGen to 64 will omit the java param 2014-03-29 22:05:53 +01:00
Petr Mrázek
0e6bc97bf3 Set permissions on the accounts.json file so other users can't access it. 2014-03-23 19:22:39 +01:00
Petr Mrázek
4a24ea6c38 Make some more error messages translateable. 2014-03-23 19:07:13 +01:00
Petr Mrázek
a01b1707de Actually start the forge install job. 2014-03-20 21:23:05 +01:00
Petr Mrázek
4901985db6 Finalize version on reload. 2014-03-19 23:23:59 +01:00
Petr Mrázek
4623c1b34f Merge remote-tracking branch 'origin/feature_fix_timeout' into develop 2014-03-19 22:26:50 +01:00
Petr Mrázek
39d3739442 Merge remote-tracking branch 'origin/feature_json_fixes' into develop 2014-03-19 22:26:25 +01:00
Petr Mrázek
26b485d82f Merge remote-tracking branch 'origin/feature_badges' into develop 2014-03-19 22:25:36 +01:00
Jan Dalheimer
a74f3b553a Remove the timeout for pre/post commands. Fixes #107 2014-03-15 09:02:56 +01:00
Jan Dalheimer
42a85def60 Get rid of one reloadInstanceVersion 2014-03-14 21:18:17 +01:00
Jan Dalheimer
e95619fa67 Pull in BaseInstaller related changes from quickmod 2014-03-14 20:48:57 +01:00
Jan Dalheimer
e5b4dee1c0 Move version stuff to the model and reimplement reordering 2014-03-14 19:51:56 +01:00
Petr Mrázek
de2eb3fc54 Fix missing return in ensureDouble() 2014-03-10 20:18:01 +01:00
Jan Dalheimer
fcc5bc2ce0 Merge branch 'develop' into feature_badges 
Conflicts:
	logic/OneSixInstance.cpp
 2014-03-10 19:24:29 +01:00
Jan Dalheimer
d11f10ea1e Fix a compiling error by adding noexcept 2014-03-10 18:55:54 +01:00
Jan Dalheimer
73fc9c79cf Instance badges. Some easter eggs and one for broken so far. 2014-03-10 17:38:27 +01:00
Petr Mrázek
5328cc7bbe Add missing include for math.h 2014-03-10 00:14:30 +01:00
Petr Mrázek
b77f4eb144 Merge remote-tracking branch 'origin/feature_paste_66994990' into integration_butchery 2014-03-10 00:01:41 +01:00
Petr Mrázek
d18b97ae3d Merge remote-tracking branch 'origin/feature_fix_log' into integration_butchery 
Conflicts:
	logic/MinecraftProcess.cpp
 2014-03-09 23:59:30 +01:00
Petr Mrázek
7fd56a30bd Merge remote-tracking branch 'origin/feature_commands' into integration_butchery 2014-03-09 23:46:46 +01:00
Petr Mrázek
b2c803a378 Improve reporting of version file errors.x 2014-03-09 23:42:25 +01:00
Petr Mrázek
ffff2cd324 Remove version patch reordering. Remove the main class display from onesix edit mods. 2014-03-09 17:38:42 +01:00
Jan Dalheimer
f1dc456802 Also reload the instance cfg 
While this should work, there don't seem to be any places where the signals are listened for, so changes probably will only be available when calling Setting::get
TODO: Fix that ^
 2014-03-09 08:43:08 +01:00
Jan Dalheimer
44f21406e9 Some pre/post related stuff 
Reload the onesix version config after the commands (addresses https://www.pivotaltracker.com/story/show/60360652)
Add a few more variables and also substitute them in the command (fixes https://www.pivotaltracker.com/story/show/66994828)
 2014-03-09 08:18:50 +01:00
robotbrain
91faaa5b59 Fix logging when system language is not en_US. 2014-03-07 19:44:15 -05:00
Jan Dalheimer
0cc682c629 Fix a few paste upload bugs 
Fixes https://www.pivotaltracker.com/story/show/66994990
 2014-03-07 16:15:38 +01:00
Petr Mrázek
47bc7e5ee3 More refactor. 2014-03-05 01:50:05 +01:00
Petr Mrázek
011ea84530 Fix missed version file assignment. 2014-03-03 09:08:32 +01:00
Petr Mrázek
d66f2500a6 No end in sight :< 2014-03-03 01:44:07 +01:00
Petr Mrázek
29cdc9364b More code butchery related to version files. No end in sight. 2014-03-03 01:23:10 +01:00
Petr Mrázek
28ad9befdc Remove a lot of error code and error handling madness. 2014-03-02 19:12:04 +01:00
Petr Mrázek
80d146866c Remove widgets from logic. 2014-03-02 02:17:55 +01:00
Petr Mrázek
5a344a2933 Gather and store liteloader metadata. 2014-03-02 02:08:01 +01:00