5650a28fc6
Hopefully fix OSX icon file
2014-01-08 21:06:31 +01:00
87b12a63a1
Make CMake output version type info
2014-01-07 19:30:08 -06:00
d7564a51ce
Bump minor version number and update changelog.
2014-01-07 19:21:42 -06:00
3629f9b999
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into new-version-system
2014-01-07 18:31:49 -06:00
fb83299e59
Deploy jars instead of extracting them at runtime, remove non-working nvidia fix
2014-01-08 01:28:33 +01:00
3202b972f8
Rework version numbering system.
...
Again...
2014-01-07 18:09:05 -06:00
267f18ca81
Add hack for Nvidia
2014-01-06 22:05:45 +01:00
ced640f68c
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2014-01-05 16:53:51 +01:00
a64eebf8eb
Add an option to force using local updater binary (for updater development)
2014-01-05 14:24:33 +01:00
ebc14a9d9d
Prepend a 5 to version strings.
2014-01-04 21:44:18 -06:00
b49fa9d2a9
Mess with the updater again.
2014-01-05 00:06:55 +01:00
3b97e3c363
Fix a few things related to the translations
2014-01-04 11:49:06 +01:00
b3dd1eba21
Notifications system. Mainly to be used in case the updater breaks.
2014-01-03 19:19:27 +01:00
431cfbc60a
Implement the news button
...
Make the news button open the latest news post in the user's web
browser.
Also remove the webkit dependency. I was planning on using it to
display the news in a custom window, but we'll just use the user's
browser for now.
2014-01-02 14:37:56 -06:00
17f1864a71
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news
...
Conflicts:
CMakeLists.txt
gui/MainWindow.h
2014-01-02 13:38:20 -06:00
1bdac97af5
Fixed buttons on osx by adding the accessible plugin.
2014-01-02 15:22:57 +01:00
0e78d34d4c
ThreadTask for all your ThreadNeeds
...
Use only when absolutely required.
2014-01-01 19:21:58 +01:00
821fb5e0ae
Move assets migration to a task. Needs threading.
2014-01-01 14:56:26 +00:00
3a4ecb57d0
Enable high DPI support on OSX
2013-12-31 02:34:00 +01:00
952b63f68d
Refactor icon lists heavily
...
* Icon list now uses a filesystem watcher for updates
* Icon folder is user-customizable
* All the little details. ALL OF THEM.
2013-12-31 01:32:51 +01:00
55e62a81b6
LiteLoader support
2013-12-28 14:22:36 +01:00
7652b3d64a
Various updater fixes
...
Updater tests for path utils
The updater now doesn't use splitpath on Windows (fixes problems with Windows XP)
Fix up paths for the OSX updater - should now install the updates into the right place
Fix translations install path - translation isntall and deploy should be fixed
2013-12-28 04:23:48 +01:00
82c87aa06f
Initial FTB support. Allows "tracking" of FTB instances.
2013-12-21 23:40:37 +01:00
d6c71488b3
Some test madness
2013-12-20 23:04:11 +01:00
9d8006b597
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news
...
Conflicts:
CMakeLists.txt
2013-12-15 15:01:34 -06:00
0ee8f90d40
Added a system to load news from MultiMC.org's RSS
...
Currently it doesn't show it anywhere in the UI. That's next.
2013-12-15 14:50:27 -06:00
5a3043398e
Use asset sizes from the index to make the progress bar better
2013-12-15 15:00:09 +01:00
d15a6490f6
Fix bugs introduced by unit test branch
...
Account json was getting rewritten by a folder
Missing icon on Windows (hopefully fixed, `doing it live`)
2013-12-14 19:26:50 +01:00
f15306a0ac
Use ctest
2013-12-14 14:17:59 +01:00
8f856f5573
Merge branch 'testing' of https://github.com/02JanDal/MultiMC5 into develop
...
Conflicts:
MultiMC.cpp
2013-12-14 14:00:23 +01:00
b69351d50d
Merge branch 'develop' of github.com:Drayshak/MultiMC5 into develop
2013-12-13 14:58:35 +00:00
979946b7bb
First sweep moving URLs to a constants file
2013-12-13 14:58:11 +00:00
39aebddf3b
Add support for 1.7.4 user_type (needs testing with legacy accounts)
2013-12-13 02:47:59 +01:00
afa5e14e20
Better (but unsorted) Java detection
2013-12-11 04:54:00 +00:00
f0104edc3d
Move fixup_bundle CMake stuff into a separate file
2013-12-10 13:37:15 -06:00
aa61bbe9e4
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
...
Conflicts:
CMakeLists.txt
gui/MainWindow.cpp
2013-12-10 07:22:22 +01:00
3f5c46a1c4
Finish assets update for 1.7.3
2013-12-10 07:12:52 +01:00
7f52bed9e3
Merge branch 'feature_updater' into develop
2013-12-09 12:04:05 -06:00
8db2e5db81
Merge branch 'feature_assets' into develop
2013-12-08 22:19:58 +01:00
d68f49ffc0
Merge branch 'feature_pasting' of https://github.com/robotbrain/MultiMC5 into develop
2013-12-08 17:39:32 +01:00
0cb8ff40b2
Finish preliminary offline support
...
* ProgressProvider now has an abort() call
* Abort button support added to the progress dialog
* YggdrasilTask and MojangAccount adapted to support abort
YggdrasilTask will time out after 10 seconds of no network activity, or when the user pushes the Play Offline button.
In offline mode, all instance update tasks are skipped! This will need further work.
2013-12-08 17:34:45 +01:00
6d438b2ef3
Work on new assets system. Working legacy assets importer, disabled assets downloading for now
2013-12-08 02:58:44 +00:00
c6f0d9ce93
fix revert
2013-12-06 17:37:12 -05:00
c614fe1cef
revert
2013-12-06 17:36:22 -05:00
5ad95134dc
work on pasting instance logs
...
blame clang for formatting changes
2013-12-06 16:24:55 -05:00
48ec8e67b8
Implement DownloadUpdateTask
...
Installing updates is not implemented yet. That's next.
2013-12-05 13:52:55 -06:00
bf94aaea75
Rework the update checking system
2013-12-04 12:34:12 -06:00
0a6399b52c
Unit testing
2013-12-02 11:09:56 +01:00
6aa9bd0f77
Renew the updater branch
...
Now with some actual consensus on what the updater will do!
2013-12-02 00:55:24 +01:00
613699b362
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2013-12-01 14:28:47 -06:00
