Jan Dalheimer
966f9d1206
Merge branch 'develop' into feature_derpstances
2014-01-24 22:00:34 +01:00
Jan Dalheimer
7d5787025a
Change naming from Derp -> OneSix until the new instance type supports legacy
2014-01-24 18:12:02 +01:00
Jan Dalheimer
156bc8f276
Forge works now too, and so does forge+liteloader
2014-01-23 21:31:41 +01:00
Petr Mrázek
d7113de3bd
Hotfix 0.2.1 for twitch.
...
Add to the changelog and tweak the version number.
2014-01-22 22:40:17 +01:00
Jan Dalheimer
a1a06cc89f
Derpstances. Everything renamed. Launching does not yet work.
2014-01-22 07:33:32 +01:00
Petr Mrázek
3a3c9ac951
Update the changelog, version, scale the instance icon
2014-01-20 01:14:11 +01:00
Petr Mrázek
2fe033c4a0
Move a bunch of resources into the resources folder.
...
Also, cat is no longer mysterious. It's just FLUFFY!
2014-01-19 05:21:09 +01:00
Petr Mrázek
d8413fa5ec
Use icon theme so we can have more than one icon size per icon
2014-01-19 04:52:34 +01:00
Petr Mrázek
54a9ee5eb0
Merge branch 'feature_localization' of https://github.com/02JanDal/MultiMC5 into develop
...
Conflicts:
gui/dialogs/SettingsDialog.cpp
gui/dialogs/SettingsDialog.ui
2014-01-12 23:04:05 +01:00
Sky
a774b3d248
Show Mojang service statuses in status bar
2014-01-12 18:28:42 +00:00
Petr Mrázek
d52079e734
No more generated resources.
2014-01-11 02:17:51 +01:00
Petr Mrázek
43a39a3bfb
Harden CacheDownload.
...
It's now super hard. SRSLY.
2014-01-11 02:06:22 +01:00
Forkk
0e22e4b399
Merge branch 'master' into develop
2014-01-08 22:52:49 -06:00
Forkk
7d74c9bc25
Change the issue tracker URL to GitHub issues
...
Bump hotfix version number and add an entry in the changelog.
2014-01-08 22:51:21 -06:00
Forkk
0b1e0221f0
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2014-01-08 21:50:58 -06:00
Petr Mrázek
5650a28fc6
Hopefully fix OSX icon file
2014-01-08 21:06:31 +01:00
Forkk
87b12a63a1
Make CMake output version type info
2014-01-07 19:30:08 -06:00
Forkk
d7564a51ce
Bump minor version number and update changelog.
2014-01-07 19:21:42 -06:00
Forkk
3629f9b999
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into new-version-system
2014-01-07 18:31:49 -06:00
Petr Mrázek
fb83299e59
Deploy jars instead of extracting them at runtime, remove non-working nvidia fix
2014-01-08 01:28:33 +01:00
Forkk
3202b972f8
Rework version numbering system.
...
Again...
2014-01-07 18:09:05 -06:00
Petr Mrázek
267f18ca81
Add hack for Nvidia
2014-01-06 22:05:45 +01:00
Petr Mrázek
ced640f68c
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2014-01-05 16:53:51 +01:00
Petr Mrázek
a64eebf8eb
Add an option to force using local updater binary (for updater development)
2014-01-05 14:24:33 +01:00
Forkk
ebc14a9d9d
Prepend a 5 to version strings.
2014-01-04 21:44:18 -06:00
Petr Mrázek
b49fa9d2a9
Mess with the updater again.
2014-01-05 00:06:55 +01:00
Jan Dalheimer
3b97e3c363
Fix a few things related to the translations
2014-01-04 11:49:06 +01:00
Jan Dalheimer
b3dd1eba21
Notifications system. Mainly to be used in case the updater breaks.
2014-01-03 19:19:27 +01:00
Forkk
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
Forkk
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
Noah Mayr
1bdac97af5
Fixed buttons on osx by adding the accessible plugin.
2014-01-02 15:22:57 +01:00
Petr Mrázek
0e78d34d4c
ThreadTask for all your ThreadNeeds
...
Use only when absolutely required.
2014-01-01 19:21:58 +01:00
Sky
821fb5e0ae
Move assets migration to a task. Needs threading.
2014-01-01 14:56:26 +00:00
Petr Mrázek
3a4ecb57d0
Enable high DPI support on OSX
2013-12-31 02:34:00 +01:00
Petr Mrázek
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
Jan Dalheimer
55e62a81b6
LiteLoader support
2013-12-28 14:22:36 +01:00
Petr Mrázek
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
Jan Dalheimer
82c87aa06f
Initial FTB support. Allows "tracking" of FTB instances.
2013-12-21 23:40:37 +01:00
Petr Mrázek
d6c71488b3
Some test madness
2013-12-20 23:04:11 +01:00
Andrew
9d8006b597
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news
...
Conflicts:
CMakeLists.txt
2013-12-15 15:01:34 -06:00
Andrew
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
Petr Mrázek
5a3043398e
Use asset sizes from the index to make the progress bar better
2013-12-15 15:00:09 +01:00
Petr Mrázek
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
Petr Mrázek
f15306a0ac
Use ctest
2013-12-14 14:17:59 +01:00
Petr Mrázek
8f856f5573
Merge branch 'testing' of https://github.com/02JanDal/MultiMC5 into develop
...
Conflicts:
MultiMC.cpp
2013-12-14 14:00:23 +01:00
Sky
b69351d50d
Merge branch 'develop' of github.com:Drayshak/MultiMC5 into develop
2013-12-13 14:58:35 +00:00
Sky
979946b7bb
First sweep moving URLs to a constants file
2013-12-13 14:58:11 +00:00
Petr Mrázek
39aebddf3b
Add support for 1.7.4 user_type (needs testing with legacy accounts)
2013-12-13 02:47:59 +01:00
Sky
afa5e14e20
Better (but unsorted) Java detection
2013-12-11 04:54:00 +00:00
Andrew
f0104edc3d
Move fixup_bundle CMake stuff into a separate file
2013-12-10 13:37:15 -06:00
