Aurora
100c3d9e36
Minor stuff
2016-09-23 02:25:37 +02:00
Aurora
a36556d7e4
Got rid of the bin2c dependency
2016-09-23 02:06:04 +02:00
Aurora
2cbaf39fd5
Make error() reboot if in a firmlaunch environment, improve errors
2016-09-22 22:51:52 +02:00
Aurora
2cc46c618b
Better to make extra sure here
2016-09-22 22:27:46 +02:00
Aurora
a0325e91f9
This can't happen
2016-09-22 22:19:27 +02:00
Aurora
e11edd5dee
Ensure the booted EmuNAND can actually exist before the FAT partition
2016-09-22 20:00:48 +02:00
Aurora
5e8990f571
Fix derp
2016-09-22 15:44:25 +02:00
Aurora
a3fd55036a
Minor stuff
2016-09-22 15:22:43 +02:00
Aurora
7a3d15c48b
Got rid of CakeHax, patched CakeBrah to load arm9loaderhax.bin directly (lifting size restrictions in the process), got rid of the pathchanger (to have a custom path you can now enable the option and write it in a /luma/path.txt file, it must start with a / (this path is also picked up by the patched CakeBrah loader), fixed loading SafeA9LHInstaller and other payloads which need the OTP hash if having a PIN, fixed writing a file smaller than the existing one not removing the extra size, slightly changed the PIN format, added support for the alternate framebuffer and made the splash screen use it (it is now displayed all at once), fixed screen issues from CakeBrah
2016-09-22 14:54:55 +02:00
TuxSH
a5b52a2470
Fix latest commit
2016-09-21 11:25:44 +02:00
Aurora
a8cd14dafd
Minor stuff
2016-09-21 00:16:27 +02:00
Aurora
c8586cfe26
Account for trailing newlines in .txts
2016-09-20 15:35:51 +02:00
Aurora
f228cb241f
Minor stuff
2016-09-20 14:39:06 +02:00
Aurora
fd33ef8496
Const-ify
2016-09-20 14:21:21 +02:00
Aurora
ba1cf6473a
Rewording of config decriptions
2016-09-19 19:04:22 +02:00
Aurora
f418dcdb7b
Minor stuff
2016-09-19 18:21:28 +02:00
Aurora
f91c26d752
Forgot this
2016-09-19 18:06:46 +02:00
Aurora
f7156f2ff2
Fix rebooting on firmlaunch
2016-09-19 17:54:11 +02:00
Aurora
e444b587cf
Fix derp
2016-09-19 17:07:56 +02:00
Aurora
a7fcc6a5cf
Add note to the access patches description
2016-09-19 16:51:17 +02:00
Aurora
872b1ccbb6
Refactor arm9Loader(), fix decrypted-arm9bin FIRM support
2016-09-19 16:33:15 +02:00
Aurora
b7b3400296
Minor stuff
2016-09-19 14:57:36 +02:00
Aurora
420ccdcb82
Merge master and dev builds
2016-09-19 14:05:56 +02:00
Aurora
eaa4d6323e
Minor stuff
2016-09-19 00:38:49 +02:00
Aurora
4e7ac41a6c
Add NUS-encrypted FIRM support (thanks to CakesFW)
2016-09-18 23:56:10 +02:00
Aurora
92f3a736a7
Support already decrypted N3DS firmware.bins in dev
2016-09-18 20:10:24 +02:00
Aurora
5a30b2b298
If the custom version is larger than 5 but smaller than 19 characters, truncate it
2016-09-18 18:32:25 +02:00
Aurora
85aaae67bf
Minor wording stuff
2016-09-18 18:05:51 +02:00
TuxSH
efe66bc72e
Make option descriptions more readable, fix bug in draw.c
2016-09-18 17:40:00 +02:00
Aurora
d7bdf3fc19
Finally fix GW downgraded NANDs (thanks GW for the easily recognizable junk)
2016-09-18 13:29:23 +02:00
Aurora
6e0f1e5235
If 'Autoboot SysNAND' is unchecked, it's impossible to select the EmuNAND if having a corrisponding directional pad payload. Skip the payload launching if 'A' is held to make this possible
2016-09-15 23:57:55 +02:00
Aurora
2f915401dd
Minor stuff
2016-09-15 20:15:20 +02:00
Aurora
14152b3072
Minor config wording stuff
2016-09-15 03:39:03 +02:00
Aurora
8f3cba37b3
Minor stuff
2016-09-14 22:48:46 +02:00
Aurora
ae7a7ba365
Minsize GW EmuNANDs don't exist
2016-09-14 12:01:39 +02:00
Aurora
724af0fdc4
Forgot this
2016-09-14 00:07:33 +02:00
Aurora
550ea2116e
Implement custom "Ver." string, must be in a textfile named "customversion.txt" in /luma, with base format Ver. %d.%d.%d-%d%ls, implemented descriptions for the options on the bottom screen, you can now boot SysNAND with an EmuNAND FIRM other than the first one, cleanup
2016-09-13 23:16:23 +02:00
Aurora
7952271d61
Get rid of selectScreen, allow clearing the screens separately, implement a PIN message function on the bottom screen (you can place a textfile named pinmessage.txt in /luma, with 800 characters max)
2016-09-13 16:22:26 +02:00
Aurora
ffaa5790c2
Cleanup, add boundary checks for files loaded from SD
2016-09-13 15:07:07 +02:00
Aurora
934c4bed0b
Minor stuff (2)
2016-09-13 02:50:05 +02:00
Aurora
6f040caa98
Minor stuff
2016-09-13 01:43:44 +02:00
TuxSH
50e5c29b1c
Display the stack dump partially on the bottom screen when handling an exception
2016-09-13 00:52:15 +02:00
Aurora
e0b5539b91
Minor stuff again
2016-09-12 19:20:31 +02:00
Aurora
050f58a3bb
Don't init screens if the PIN file does not exist or is invalid
2016-09-12 19:03:31 +02:00
Aurora
c739ed8e48
Added visual indication of the PIN digits in the input screens
2016-09-12 18:47:47 +02:00
Aurora
a09fc6ebcb
Minor stuff
2016-09-12 18:14:03 +02:00
Aurora
4367ea6afa
Forgot about this
2016-09-12 15:35:55 +02:00
Aurora
da0adeb39e
Switch to enums for the options
2016-09-11 19:17:56 +02:00
Aurora
63160a22a6
Hide N3DS CPU setting on O3DS
2016-09-11 18:45:53 +02:00
Aurora
66e0cfc185
memsearch() replaced with a Boyer-Moore Horspool implementation due to Quick Search being buggy in some rare cases
2016-09-11 16:23:59 +02:00
Aurora
7bd0e4f5b4
Revert "Remove some ifdefs"
...
This reverts commit 7271850df2
.
2016-09-11 03:29:39 +02:00
TuxSH
7271850df2
Remove some ifdefs
2016-09-11 01:33:51 +02:00
Aurora
3034420ac2
Merge changes, also change the dev build variable to DEV, which must have a value of TRUE
2016-09-11 00:58:34 +02:00
Aurora
99a157649d
Minor stuff
2016-09-11 00:37:56 +02:00
TuxSH
e6645554f0
Merge branch 'master' into developer
...
Conflicts:
source/firm.c
source/patches.c
source/patches.h
2016-09-10 21:35:23 +02:00
TuxSH
0f83d1ffaa
Fix broken assumptions and bugs
2016-09-10 21:12:53 +02:00
Aurora
2286eb21a7
Minor stuff
2016-09-08 23:21:40 +02:00
Aurora
29dcfca608
Copyright stuff
2016-09-08 23:07:03 +02:00
Aurora
f1cb9630ec
Improve readability
2016-09-08 22:33:25 +02:00
Aurora
dc8e4e5f14
Merged the two branches
2016-09-08 18:50:17 +02:00
Aurora
72c8212a0e
Merge branch 'master' into developer
2016-09-08 16:11:56 +02:00
Aurora
2cd2a081d6
Update FatFs to 0.12b
2016-09-08 16:11:34 +02:00
Aurora
b44ec544f4
Merge branch 'master' into developer
2016-09-08 13:51:03 +02:00
Aurora
063eae7e95
Fix another derp
2016-09-08 13:50:41 +02:00
Aurora
2552572904
Merge master into developer
2016-09-08 13:39:38 +02:00
Aurora
b74dda42a2
Fix config derp, change the logic of the NIM update patch to only be applied when booting with R
2016-09-08 13:38:01 +02:00
Aurora
6e178e2069
Merge branch 'master' into developer
2016-09-08 03:11:06 +02:00
Aurora
277d723992
Minor stuff (2)
2016-09-08 02:51:51 +02:00
Aurora
2f6afe9932
Minor stuff
2016-09-08 01:50:02 +02:00
Aurora
edcc617780
Merge master into developer
2016-09-08 01:43:36 +02:00
Aurora
5d39242b83
Added support for up to 4 emuNANDs (the "second emuNAND as default" toggle is now a multi option, and you can choose the emuNAND on startup by holding Up (1)/Right (2)/Down (3)/Left (4) when EmuNAND is being booted), added a B payload as the B button was freed
2016-09-08 00:49:55 +02:00
Aurora
ddbe5fd27b
Round NAND size to 4MB for the default layout
2016-09-07 22:22:31 +02:00
Aurora
deb91d1d02
Refactor the emuNAND code
2016-09-07 18:05:43 +02:00
Aurora
63073ea07f
Merge pull request #202 from DarkMatterCore/master
...
Support additional EmuNAND layouts.
2016-09-07 18:03:12 +02:00
Pablo Curiel
a331fcd873
Add minimum NAND size exception for 2DS.
2016-09-07 11:33:05 -04:00
Pablo Curiel
99654bd5b2
Fix compatibility with 2DS.
...
Adds a check to determine if the NAND size is greater than the size of
an Old 3DS Toshiba NAND.
2016-09-07 11:25:20 -04:00
Aurora
f10427287f
Update sdmmc (thanks @gemarcano)
2016-09-07 14:26:01 +02:00
Pablo Curiel
5b6318ee3a
Support additional EmuNAND layouts.
...
Fixes compatibility with a second EmuNAND placed after an EmuNAND
created with either the 'default' or 'minimum' setup sizes with EmuNAND9
/ 3DS Multi EmuNAND Creator.
2016-09-06 22:26:48 -04:00
Aurora
98cdbe0784
Minor stuff
2016-09-06 22:27:23 +02:00
Aurora
e4eb3ae38d
Minor stuff
2016-09-06 22:23:28 +02:00
Aurora
6686e4add7
Minor cleanup, added error when writing an exception dump fails
2016-09-06 19:33:50 +02:00
Aurora
96a274bf7d
Merge branch 'master' into developer
2016-09-06 18:09:58 +02:00
Aurora
add17a7994
Not needed
2016-09-06 18:08:54 +02:00
Aurora
b2e9f5377b
Merge branch 'master' into developer
2016-09-06 15:52:59 +02:00
Aurora
d3d315784c
Fix derp
2016-09-06 15:52:08 +02:00
Aurora
942a371b6a
Fix patchKernel9Panic() pattern (fix crashes on certain O3DS FIRMs)
2016-09-06 15:41:11 +02:00
Aurora
66ffc78f60
Merge branch 'master' into developer
2016-09-06 14:42:35 +02:00
Aurora
a9570cef14
Minor stuff
2016-09-06 14:15:32 +02:00
Aurora
16bc08f046
Minor stuff
2016-09-06 14:09:29 +02:00
Aurora
33d3dd256d
Merge branch 'master' into developer
2016-09-04 14:06:37 +02:00
Aurora
fc151f7595
Consistency
2016-09-04 14:05:29 +02:00
Aurora
9152884815
Merge master into developer
2016-09-04 13:55:31 +02:00
Aurora
2b4e97bec5
Get rid of the PIN on/off toggle and add an Off status to the multi option, change the config layout to allow for more multi options, add macros for all options
2016-09-04 13:45:03 +02:00
Aurora
a63393504f
Merge branch 'master' into developer
2016-09-04 00:55:42 +02:00
Aurora
97ae8d2d44
Forgot this
2016-09-04 00:55:20 +02:00
Aurora
6c59728516
Merge master into developer
2016-09-04 00:48:09 +02:00
Aurora
201fe05a06
Implement selectable PIN size, added support for the directional pad in PINs
2016-09-04 00:38:17 +02:00
Aurora
a78889523f
Merge branch 'master' into developer
2016-09-03 23:08:27 +02:00
Aurora
5cd1a207c9
Forgot an instance where the PIN path is used
2016-09-03 23:07:51 +02:00
Aurora
423f0ca631
Merge branch 'master' into developer
2016-09-03 22:01:12 +02:00
Aurora
7612e38d41
Increase the config minor version
2016-09-03 22:00:49 +02:00
Aurora
bf234950cb
Merge master into developer
2016-09-03 21:55:37 +02:00
Aurora
bd992fca15
Remove the TWL dev launcher patch as it became unnecessary
2016-09-03 19:11:44 +02:00
Aurora
45fee57abd
Merge master into developer
2016-09-03 18:19:02 +02:00
Aurora
a2bca96d47
Cleanup, use sizeof() for pattern memsearches
2016-09-03 18:15:00 +02:00
Aurora
9862256ca7
Do not hardcode the FIRM version check for the module patch, check for the free space to be enough
2016-09-03 18:01:56 +02:00
Aurora
6afc8b3b5c
Merge master into developer
2016-09-03 17:49:54 +02:00
Aurora
9b4b4ec543
Cleanup, use sizeof() for pattern memsearches
2016-09-03 15:36:35 +02:00
Aurora
d412711868
More cleanup, ARM9 exceptions for Luma and payloads are always enabled (FIRM ARM9 and ARM11 exceptions need Dev. options not to be "none")
2016-09-03 02:25:09 +02:00
Aurora
0b33551d94
Clarify option
2016-09-02 23:23:46 +02:00
Aurora
9c1b585054
Merge branch 'master' into developer
2016-09-02 22:57:23 +02:00
Aurora
fc3a69d9ca
Small cleanup
2016-09-02 22:56:57 +02:00
Aurora
cce4a6d07f
Cleanup, re-enabled module patch on N3DS on 8.1, 9.0 and >= 11.0 FIRMs
2016-09-02 22:51:11 +02:00
Aurora
f2181b1d3e
Fix comments
2016-09-02 15:20:42 +02:00
Aurora
c93a97f8d7
mcuReboot now checks for isFirmlaunch
2016-09-02 15:19:14 +02:00
Aurora
8fd2525cd1
Make the correct FIRM type always be set and fix loading old NATIVE_FIRMs from SD
2016-09-02 15:07:03 +02:00
Aurora
62a70cfdac
Old NATIVE_FIRMs do not have injectable modules
2016-09-02 14:47:20 +02:00
Aurora
ca0a79fc89
Merge branch 'master' into developer
2016-09-02 14:28:47 +02:00
Aurora
104b8e859f
mcuReboot now checks for isFirmlaunch
2016-09-02 14:27:56 +02:00
Aurora
a99b26ff8c
Merge master into developer
2016-09-02 14:24:24 +02:00
Aurora
9bc62ec12d
Move config and PIN paths to the respective headers
2016-09-02 14:14:19 +02:00
Aurora
84a6bb772f
Merge master into developer
2016-09-02 13:44:07 +02:00
Aurora
263a5eda56
Update to latest FatFs patch
2016-09-02 13:40:20 +02:00
Aurora
631fad24c0
Make firmware.bin check more readable
2016-09-01 17:56:33 +02:00
Aurora
f1d77fa62a
Add checks for the FIRM bin files to be correct for the console
2016-09-01 17:51:03 +02:00
TuxSH
3bc247b43b
Update firm.c
2016-09-01 17:09:58 +02:00
Aurora
3608799dff
Merge master into developer
2016-08-31 19:54:12 +02:00
Aurora
c0f042bc2a
Can not support safe_firm firmlaunches without 3ds_injector at the moment
2016-08-31 19:50:37 +02:00
TuxSH
8982ff259a
Add support for 1.x NATIVE_FIRM (on sysNAND) and the O3DS v0 SAFE_FIRM
2016-08-31 19:30:45 +02:00
Aurora
726b06b748
Merge master into developer
2016-08-31 16:14:20 +02:00
Aurora
0057ab9c5a
Fix config not being written in a rare circumstance
2016-08-31 16:11:44 +02:00
Aurora
048bf0ee4d
Cleanup
2016-08-31 13:49:10 +02:00
TuxSH
8ceeca372f
Fix build issue
2016-08-31 13:24:29 +02:00
TuxSH
4326ac9be1
Merge branch 'developer' of https://github.com/AuroraWright/Luma3DS into developer
...
Conflicts:
source/patches.c
2016-08-31 13:14:12 +02:00
TuxSH
697c64abe4
Fix and restrain module access checks
2016-08-31 13:11:41 +02:00
Aurora
7e8cf84c42
Fix yet another derp
2016-08-30 22:51:15 +02:00
Aurora
b6d91375a5
Minor cleanup
2016-08-30 21:56:27 +02:00
Aurora
61305688fd
Move the itoa function to strings.c
2016-08-30 21:34:03 +02:00
Aurora
492ae4139f
Merge branch 'master' into developer
2016-08-30 21:32:48 +02:00
Aurora
a84f393bd5
Move the itoa function to strings.c
2016-08-30 21:32:15 +02:00
Aurora
5de54d6f9f
Fix derp
2016-08-30 21:11:11 +02:00
Aurora
8fc797120f
Merge master into developer, use the new string functions
2016-08-30 21:02:45 +02:00
Aurora
5406d648bc
Fix derp
2016-08-30 20:01:45 +02:00
Aurora
a76c15d018
Introduce a strcat replacement
2016-08-30 17:48:41 +02:00
Aurora
ae8caf3d3a
Merge master into developer, remove createDirectory calls
2016-08-30 17:09:29 +02:00
Aurora
f221915a95
Get rid of createDirectory and make fileWrite handle directory tree creation
2016-08-30 17:04:29 +02:00
Aurora
7f93733107
Rewrite the module copying function
2016-08-30 02:18:32 +02:00
Aurora
e8b9e49f57
Fix derps (thanks to @Mrrraou), general cleaup, rewrite of the modules copying function
2016-08-30 02:08:07 +02:00
TuxSH
cb9576b10e
Merge branch 'master' into developer
...
Conflicts:
source/firm.c
source/firm.h
source/patches.c
source/patches.h
2016-08-29 20:12:23 +02:00
Aurora
abf7c8e565
Replace pinKeyToLetter with a C implementation, minor cleanup
2016-08-29 18:11:59 +02:00
Aurora
2ffe4a5451
Revert "Skip PIN verification after a MCU reboot on A9LH"
...
This reverts commit 18bd4bbcf6
.
2016-08-29 16:04:17 +02:00
Aurora
18bd4bbcf6
Skip PIN verification after a MCU reboot on A9LH
2016-08-29 15:57:32 +02:00
Aurora
8209433696
Cleanup and refactoring
2016-08-29 15:42:54 +02:00
Aurora
ad9e00acaa
Add delay if a PIN was just verified and SAFE_MODE is being booted
2016-08-29 13:56:23 +02:00
Aurora
c96f96258f
Only patch 2.x NATIVE_FIRM on A9LH
2016-08-29 01:58:01 +02:00
Aurora
82699f3e00
Merge readPin and verifyPin
2016-08-28 23:41:41 +02:00
Aurora
e2d828a4a2
Fixed derp
2016-08-28 15:58:10 +02:00
Aurora
92328c6a7e
Made it easier to change your PIN, added PIN file deletion when needed
2016-08-28 15:51:54 +02:00
Aurora
3f8ad17e86
Minor PIN cleanup and UI changes
2016-08-28 14:59:33 +02:00
Aurora
52999db43a
Readability stuff
2016-08-28 14:41:18 +02:00
Aurora
760aa99709
Revert "Add back reboot patch on 2.x"
...
This reverts commit 51c514de84
.
2016-08-28 12:33:00 +02:00
TuxSH
51c514de84
Add back reboot patch on 2.x
2016-08-28 11:48:35 +02:00
Aurora
317899b4bf
Fix another derp
2016-08-28 02:56:46 +02:00
Aurora
4c93d2b1f9
Better to put this here
2016-08-28 02:49:53 +02:00
Aurora
71c5404bfe
Fix derp
2016-08-28 02:41:00 +02:00
Aurora
9c5248b87a
Cleanup previous commit
2016-08-28 02:38:52 +02:00
TuxSH
83a0293af4
Add support (firmprot and firmlaunch patches) for 2.x on sysNAND
2016-08-28 00:32:47 +02:00
TuxSH
84f3eddaf8
Merge branch 'master' into developer
...
Conflicts:
source/config.c
source/config.h
2016-08-27 19:31:42 +02:00
Aurora
94f0d873df
Cleanup
2016-08-27 17:34:37 +02:00
Aurora
d6f66d24fa
Consistency
2016-08-27 16:11:37 +02:00
Aurora
31458e9938
Implement a new config file format which allows invalidating the config with new releases, fix config-related bugs, cleanup
2016-08-27 16:00:15 +02:00
TuxSH
dca612ffd7
Update firm.c
2016-08-27 13:13:43 +02:00
TuxSH
5177308d48
Update firm.c
2016-08-27 13:11:55 +02:00
TuxSH
59ab44a8c7
Merge branch 'master' into developer
...
Conflicts:
source/firm.c
2016-08-27 00:44:31 +02:00
Aurora
c711ed6253
Added a different error for < 3.x NANDs as they can not be booted currently
2016-08-27 00:34:25 +02:00
TuxSH
58c6be17eb
Merge branch 'master' into developer
2016-08-27 00:11:34 +02:00
TuxSH
259bcc686c
Merge branch 'master' into developer
...
Conflicts:
source/config.c
source/firm.c
2016-08-26 23:28:31 +02:00
Aurora
356268eae5
Welcome back to the 1,25s speed boost
2016-08-26 22:24:23 +02:00
Aurora
2dd64b8a92
Merge branch 'master' of https://github.com/AuroraWright/Luma3DS
2016-08-26 21:38:36 +02:00
Aurora
b5cddedb7d
Fix config derp
2016-08-26 21:38:03 +02:00
TuxSH
7afdc2b3b5
"Fix" the twlbg patches and make them optional
2016-08-26 19:09:14 +02:00
Aurora
60c4956290
Fix wrong bootconfig being picked up by 3ds_injector, cleanup
2016-08-26 18:44:39 +02:00
TuxSH
76cee0d95b
Merge branch 'master' into developer
2016-08-25 21:22:32 +02:00
TuxSH
7331a919e4
Fix bug.
2016-08-25 18:53:37 +02:00
TuxSH
27ea6b96c4
Merge branch 'master' into developer
...
Conflicts:
Makefile
source/firm.c
source/patches.c
2016-08-25 18:49:00 +02:00
TuxSH
33238cee54
Remove loading of /luma/TwlBg.cxi, fix bugs.
2016-08-25 16:39:43 +02:00
TuxSH
384dd2ad81
Implement on-the-fly patching of TwlBg
...
(and port the patches from https://github.com/ahezard/twl_firm_patcher ; big thanks to ahezard and people mentioned in this page; also to Subv for the original patching idea (for NATIVE_FIRM))
2016-08-25 00:13:43 +02:00
TuxSH
4885e0b8d8
On second thought...
2016-08-23 20:51:48 +02:00
TuxSH
2a84911d3b
Setting "Dev. options" to "None" now disables the exception handlers and related patches (again)
...
Port the UNITINFO patch to TWL/AGB (although it doesn't make debugging information display on fatal errors) and SAFE firms.
On dev units this patch will set it to its "retail" value (i.e. 0)
2016-08-23 20:39:42 +02:00
TuxSH
a13fdeecf6
Merge branch 'master' into developer
...
Conflicts:
source/firm.c
source/patches.c
source/patches.h
2016-08-21 22:31:39 +02:00
TuxSH
74ac76ba84
Merge branch 'master' of https://github.com/AuroraWright/Luma3DS
2016-08-21 22:09:47 +02:00
TuxSH
253e031f83
Add support for loading /luma/TwlBg.cxi (on dev branch this will take precedence)
2016-08-21 22:09:27 +02:00
TuxSH
ef1ecf859c
Update draw.c
2016-08-20 19:59:25 +02:00
TuxSH
0951260df7
Merge branch 'master' into developer
...
Conflicts:
source/patches.c
2016-08-18 00:39:21 +02:00
TuxSH
b87dadbb72
Update patches.c
2016-08-18 00:36:28 +02:00
TuxSH
1dd6a9821a
Merge branch 'master' into developer
...
Conflicts:
Makefile
source/patches.c
2016-08-18 00:35:20 +02:00
TuxSH
50a2424001
Implement svcGetCFWInfo in place of svc 0x2e (which is stubbed). Luma3DS now boots ca. 1.5s faster
...
Fix bug in pin.c where the START button wasn't recognized as well.
2016-08-17 23:47:30 +02:00
Aurora
de3eb6ccd7
Merge branch 'master' into developer
2016-08-16 23:10:25 +02:00
Aurora
4f8c66b2b7
There would not be an use for this
2016-08-16 22:59:25 +02:00
Aurora
4d9cbc4e19
Fix fail
2016-08-16 22:46:41 +02:00