cba22f7ee0
Bump version and update changelog.
2014-05-01 13:10:46 -05:00
9d724e0fe4
Merge remote-tracking branch 'origin/feature_cmake_style' into develop
...
Conflicts:
CMakeLists.txt
2014-04-21 23:33:00 +02:00
4674aad125
Create a new login dialog
2014-04-16 16:19:12 +02:00
a00fb1e8da
Only use tabs for intendention
2014-04-09 15:41:49 +02:00
3cd2b898e5
Merge remote-tracking branch 'origin/develop' into feature_cmake_style
...
Conflicts:
CMakeLists.txt
2014-04-07 17:44:52 +02:00
17d4947b30
Merge remote-tracking branch 'origin/feature_dotcmake' into develop
2014-04-06 20:56:40 +02:00
dd7b6642a3
Use the same style of CMake files everywhere
2014-04-06 19:43:09 +02:00
eb246c4fa7
.cmake files to reduce "code" duplicate
2014-04-06 18:12:48 +02:00
6ef38d0873
Coverity build and upload target. Also GitFunctions.
2014-04-06 18:02:28 +02:00
482ad250a4
Workaround for dirty build folders.
...
My disgust just turned into barely contained rage :<
2014-04-06 03:59:37 +02:00
f9169654c5
Build fixage for the changed build config
2014-04-06 03:48:59 +02:00
42e305bb9d
Get rid of long rebuilds because of minor cmake config changes
2014-04-06 00:33:33 +02:00
ad9d082f57
Do not spam logs too much, bump version and add to changelog.
2014-04-01 23:03:04 +02:00
29b00eab31
Fix FTB-related issues
2014-03-31 00:19:43 +02:00
b60fbf87ab
Bump version to 0.3.0
2014-03-23 23:25:55 +01:00
4a24ea6c38
Make some more error messages translateable.
2014-03-23 19:07:13 +01:00
4f452d5815
Add a timer for clicking away the notification dialog
2014-03-15 14:18:29 +01:00
28ad9befdc
Remove a lot of error code and error handling madness.
2014-03-02 19:12:04 +01:00
7c24bcc834
Reorganize the version-related code.
2014-03-01 23:06:47 +01:00
00f4f533aa
Fix to the way translations are handled. Also updated the german translation with the new strings.
2014-02-25 18:46:50 +01:00
acff155624
Merge branch 'feature_screenshots' into integration_json_and_tools
...
Conflicts:
logic/net/URLConstants.h
Resolve issues with multiple definitions of URL constants by moving them to their own object file.
2014-02-25 01:52:58 +01:00
9d4e840a6e
Screenshots: Optimize image loading and memory use, fix list and button layout.
2014-02-25 01:23:33 +01:00
cb5cfe7242
Reorganize all the screenshot files
2014-02-25 00:51:24 +01:00
da33fa4090
Imgur album creation
2014-02-24 11:30:27 +01:00
f7c97efcf3
Merge branch 'feature_profiling' into integration_json_and_tools
2014-02-24 00:29:13 +01:00
4a77524b05
Initial stuff. It doesnt work.
2014-02-23 16:14:24 -05:00
7146724607
New, better, liteloader support
2014-02-19 22:34:17 +01:00
9c87bc6c4b
Restructure
2014-02-16 12:52:35 +01:00
616c372690
Fix more stuff. Detached tools, only MCEdit for now.
2014-02-16 10:46:14 +01:00
efa8e26a3f
Profiler support. Currently JProfiler and JVisualVM are implemented.
2014-02-15 14:19:35 +01:00
af33b96684
Merge branch 'feature_groupview' into integration_derpstances_groupview
2014-02-08 22:18:32 +01:00
7839c4ecc0
Pave.
2014-02-04 01:40:51 +01:00
1936bd181f
Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 into feature_derpstances
...
Conflicts:
gui/dialogs/OneSixModEditDialog.cpp
logic/OneSixUpdate.cpp
2014-02-01 19:37:16 +01:00
b4b6091372
Add 'empty text' to all the version selection dialogs.
...
Customize it for the Forge one so people finally shut up about 1.7.4
2014-01-29 01:20:19 +01:00
ffbc5bb62c
Offline mode can be used even when online.
...
Allow the user to pick a player name for offline mode.
Big auth refactor. Now using session objects instead of the accounts themselves.
Sessions only last for one instance start and hold all the auth and player data.
2014-01-27 03:00:49 +01:00
966f9d1206
Merge branch 'develop' into feature_derpstances
2014-01-24 22:00:34 +01:00
7d5787025a
Change naming from Derp -> OneSix until the new instance type supports legacy
2014-01-24 18:12:02 +01:00
156bc8f276
Forge works now too, and so does forge+liteloader
2014-01-23 21:31:41 +01:00
d7113de3bd
Hotfix 0.2.1 for twitch.
...
Add to the changelog and tweak the version number.
2014-01-22 22:40:17 +01:00
a1a06cc89f
Derpstances. Everything renamed. Launching does not yet work.
2014-01-22 07:33:32 +01:00
3a3c9ac951
Update the changelog, version, scale the instance icon
2014-01-20 01:14:11 +01:00
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
d8413fa5ec
Use icon theme so we can have more than one icon size per icon
2014-01-19 04:52:34 +01:00
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
a774b3d248
Show Mojang service statuses in status bar
2014-01-12 18:28:42 +00:00
d52079e734
No more generated resources.
2014-01-11 02:17:51 +01:00
43a39a3bfb
Harden CacheDownload.
...
It's now super hard. SRSLY.
2014-01-11 02:06:22 +01:00
0e22e4b399
Merge branch 'master' into develop
2014-01-08 22:52:49 -06:00
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
0b1e0221f0
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
2014-01-08 21:50:58 -06:00
