0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,616 Commits 1 Branch 0 Tags 29 MiB
d587720010
Commit Graph

687 Commits

Author SHA1 Message Date
Petr Mrázek
5628d3d379 SCRATCH squash MinecraftLauncher into BaseLauncher 
needs to be split differently
needs to be squashed together with the logic from MainWindow
 2015-06-30 07:16:20 +02:00
Petr Mrázek
f86a39c21c SCRATCH fix BaseLauncher 2015-06-30 07:16:20 +02:00
Petr Mrázek
34ddfc7ecc GH-1053 base process and launch refactor, part 1 2015-06-30 07:16:20 +02:00
Petr Mrázek
f723721bd0 GH-1069 env hack/passthhrough for LD_PRELOAD and LD_LIBRARY_PATH 2015-06-12 09:40:41 +02:00
Petr Mrázek
b427a652ad GH-1009 use .sh instead of .pyc - .pyc doesn't work at all 2015-06-11 02:33:02 +02:00
Petr Mrázek
1feb4bb387 GH-1009 add mcedit.pyc as a valid mcedit 'executable' 2015-06-10 23:51:05 +02:00
Petr Mrázek
15b7c3039a GH-1060 update tweaks 
* download to multimc folder hierarchy
* use rename, not copy
* keep backup after update
* clean previous backup before update
* it's not 'copy', it's 'replace'
 2015-06-09 23:30:28 +02:00
Petr Mrázek
82e05661d2 GH-1060 implement very basic updater (only linux and maybe osx right now) 2015-06-09 00:03:42 +02:00
Petr Mrázek
166813cb91 GH-1060 remove some old updater bits and pieces 2015-06-09 00:03:42 +02:00
Petr Mrázek
38e42ad794 GH-1049 fix bad ifdefs that prevent linux-specific env blacklisting 2015-06-08 23:54:30 +02:00
Petr Mrázek
977e11ef8d GH-1051 ignore CDPATH 2015-06-06 23:40:13 +02:00
Jan Dalheimer
1e51b62c88 NOISSUE Comment and bugfix the Resource system 2015-06-06 21:23:05 +02:00
Petr Mrázek
24db645167 NOISSUE sanitize Json 
Removes magical parameter madness.
All require* can throw
All ensure* need a default value and never throw
 2015-06-06 21:23:05 +02:00
Petr Mrázek
dde35a0eb8 NOISSUE remove StandardTask 2015-06-06 21:23:05 +02:00
Petr Mrázek
57b75dfcf7 NOISSUE document exceptions a bit more 2015-06-06 21:23:05 +02:00
Petr Mrázek
06a67fbd38 NOISSUE use FS a bit more 2015-06-06 21:23:05 +02:00
Jan Dalheimer
3a8b238052 NOISSUE Various changes from multiauth that are unrelated to it 2015-06-06 21:23:05 +02:00
Petr Mrázek
405cea1778 GH-1031 include icon in exported instance if it is custom 2015-06-01 01:19:12 +02:00
Petr Mrázek
6fd18a5cce GH-1016 print list of mods, coremods and jarmods 
Includes a change to jar mods, where they gain an 'originalName' attribute used only for display
 2015-05-31 21:50:01 +02:00
Petr Mrázek
9920062003 GH-1016 print mods, jar mods and core mods on start 
Needs some work - jar mods just have the uuid name
 2015-05-31 21:50:01 +02:00
Petr Mrázek
99f248ecd4 GH-1015 catch exceptions when doing profile reapply 
This is a temporary solution.
 2015-05-31 20:00:15 +02:00
Petr Mrázek
b9e06b5da0 GH-1021 make builtin versions not customizable 
They use attributes not defined in the OneSix format.
 2015-05-31 19:24:39 +02:00
Petr Mrázek
ff64b6cf1d GH-1020 use plain strings for library URLs 
Because the URLs can contain {}, which are percent encoded in URLs and this breaks variable substitution
 2015-05-31 17:51:20 +02:00
Petr Mrázek
84757f485b GH-1015 fix crash when version is incomplete and adding jar mods 2015-05-29 08:32:05 +02:00
Petr Mrázek
a98e1df10c GH-1011 fetch missing versions when customizing/reverting Minecraft patches 2015-05-28 09:36:58 +02:00
Petr Mrázek
f9e186ab70 GH-967 make libraries handle their own path prefix 
Makes it possible to mix libraries managed by FTB and MultiMC
Backport from unstable
 2015-05-27 01:30:18 +02:00
Petr Mrázek
2f087b55b9 GH-997 fix saving of settings values with special characters 
Values are now escaped properly
 2015-05-26 08:33:10 +02:00
Petr Mrázek
c1c23e47a7 GH-1003 Fix settings dialog delays 2015-05-26 08:14:33 +02:00
Petr Mrázek
185ff238c2 GH-992 GH-997 Do not rewrite values when loading FTB packs 
name, icon and notes won't be overwritten when loading FTB packs
this also eliminates the file saving delay from setting the values
 2015-05-25 07:35:43 +02:00
Petr Mrázek
09673cc16e GH-977 Initialize FTB icon properly (iconKey vs logo), remove debug prints 2015-05-24 19:48:22 +02:00
Petr Mrázek
dfb0a3b724 GH-991 implement wrapper commands 2015-05-24 14:49:54 +02:00
Petr Mrázek
ce99fabe13 GH-992 Add a transaction/locking mechanism to settings objects 
This can cut the FTB loading by ~66% - worth it, but not ideal.
Real solution will have to be implemented later.
 2015-05-23 16:07:47 +02:00
Petr Mrázek
0e0ddf5494 GH-977 Improve FTB loading and instance creation 2015-05-22 23:06:51 +02:00
Petr Mrázek
8715746774 GH-977 this isn't funny anymore... 2015-05-22 01:27:59 +02:00
Petr Mrázek
cfdfd0e811 GH-977 possibly fix FTB on windows. Maybe. Partially. Now maybe for real. 2015-05-22 01:08:37 +02:00
Petr Mrázek
81b37dae18 GH-977 possibly fix FTB on windows. Maybe. Partially. 2015-05-21 23:25:16 +02:00
Petr Mrázek
29ce36c7bc GH-983 use 'minecraft.jar' for ancient jar-modded versions 
Fixes NEI in MC 1.4.7 and probably other obscure issues
 2015-05-21 22:38:31 +02:00
Petr Mrázek
22a0294a33 GH-985 fix jar mods 2015-05-21 20:47:47 +02:00
Petr Mrázek
743af4769e GH-952 Hardcore version page tweakery 
Version patches get a lot of new flags that determine which actions are allowed
Version page respects the flags
Customize, revert and edit for version patches
Builting patches can be customized
 2015-05-17 23:38:28 +02:00
Petr Mrázek
3ed467e1fa NOISSUE do not dump minecraft version files into the log 2015-05-16 23:33:42 +02:00
Petr Mrázek
a39fb1ef17 GH-958 print PID when starting Minecraft 2015-05-16 18:42:17 +02:00
Petr Mrázek
f2026df597 GH-952 do not remove {version,custom}.json files, rename them 2015-05-16 18:42:14 +02:00
Petr Mrázek
416e08f741 GH-952 flesh out {version,custom}.json upgrade step 2015-05-15 01:37:15 +02:00
Petr Mrázek
88f975eff7 NOISSUE only watch mod folders when the user is looking at them 2015-05-11 22:50:35 +02:00
Petr Mrázek
11c376f6f1 NOISSUE Remove PermGemn warning ignoring 2015-05-07 08:42:35 +02:00
Petr Mrázek
757b4e260b NOISSUE more logging 2015-05-06 22:16:52 +02:00
Petr Mrázek
2a4647125d GH-942 fix vanilla version list 
Latest release gets the star
Latest snapshot, if it's newer than latest release gets the bug
 2015-05-06 09:00:21 +02:00
Sky
1271188019 Fixed some Forge typos in dialogs. Fixes #940 2015-05-05 00:33:34 +01:00
Petr Mrázek
4c6edc9fd4 GH-907 fix location/java override for java detection 2015-05-05 01:09:28 +02:00
Petr Mrázek
c10a4a54d9 NOISSUE windows hates me 2015-05-04 01:28:16 +02:00
Petr Mrázek
1b884d0a9d GH-907 improve Java testing and PermGen deprecation handling 2015-05-04 01:20:48 +02:00
Petr Mrázek
8e9d5f56b5 GH-933 map exit code -1 to 'crashed' 2015-05-02 23:48:18 +02:00
Petr Mrázek
5779ffd664 GH-922 improve version select dialogs 2015-05-02 23:42:33 +02:00
Petr Mrázek
4fc4a17256 NOISSUE handle recommended versions better 
Moved constants to the version data file
Use recommended Minecraft instead of latest stable for new instances by default
 2015-05-02 12:44:37 +02:00
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