Commit graph

877 commits

Author SHA1 Message Date
KillzXGaming
cea6f264cd Some swizzle pattern fixes (Also fixes bflim issues) 2019-08-25 20:46:19 -04:00
LockeExile
a8b96185ca resolve a few warnings 2019-08-25 13:08:32 -07:00
LockeExile
549a83604b remove some more unused files 2019-08-24 23:09:04 -07:00
LockeExile
29e2b104c1 change debug output directory 2019-08-24 22:20:05 -07:00
LockeExile
a245dac9a8 clean STB Library debug build outputs 2019-08-24 22:01:16 -07:00
KillzXGaming
a5da5c8609 Always use linear types for anim rotation because angular breaks for some reason 2019-08-23 19:58:31 -04:00
KillzXGaming
ef9db11f03 Fix .anim exporting 2019-08-23 19:54:16 -04:00
KillzXGaming
a6c691bd82 Some shader and sampler fixes 2019-08-21 17:08:24 -04:00
KillzXGaming
4a137d34cc Make alpha seperate from colors in the hue selector for ptcl 2019-08-20 19:56:47 -04:00
KillzXGaming
1815168479 Shader fixes 2019-08-20 19:46:06 -04:00
KillzXGaming
2bed8a49a6 Fix UV editor if no textures are present 2019-08-20 17:22:01 -04:00
KillzXGaming
957639f80d Adjust PTCL UI a bit for switch. Slowly add some stream stuff to archives. 2019-08-20 16:52:48 -04:00
KillzXGaming
8b68c749d3 Adjust combobox control 2019-08-19 18:43:39 -04:00
KillzXGaming
2f8041bc93 Improve PTCL color editing and add texture icon previewing. 2019-08-19 18:28:59 -04:00
KillzXGaming
33456d0295 More fixes
Limit the texture renderer to prevent memory issues.
Prevent textures to be loaded and bound if gl textures cannot load.
Fix gen bntx types (PC) from having inaccuate target set.
2019-08-18 20:10:29 -04:00
KillzXGaming
3769cc12c2 EFFN ptcl fixes and add saving back 2019-08-17 09:58:17 -04:00
KillzXGaming
de84563377 Improve nutexb context menus 2019-08-16 17:18:44 -04:00
KillzXGaming
655cdff142 Add some useful shortcuts. Add Text editor fixes. 2019-08-16 17:06:34 -04:00
KillzXGaming
2264c8117b Add support for v4 PACx files 2019-08-15 17:20:14 -04:00
KillzXGaming
751c1dc550 Batch create bntx with New From File - BNTX From Image 2019-08-14 16:36:19 -04:00
KillzXGaming
00e9c6506f A few fixes and additions
Files can be dragged out of and dropped within archives if adding is supported..
Fixed some archive issues with it updating, and removing improperly.
Adjustments to default transform bone settings for bfres to prevent any deform issues if a new skeleton is created.
2019-08-14 15:27:45 -04:00
KillzXGaming
9ad828bbca Lots more uv editor fixes 2019-08-12 20:09:35 -04:00
KillzXGaming
89ce65908c Load all containers to uv editor if drawables is set to preview al 2019-08-12 19:37:57 -04:00
KillzXGaming
9e61c677ed Add option to create screenshots 2019-08-12 19:27:48 -04:00
KillzXGaming
693fc7f934 Some anim exporting fixes 2019-08-12 16:34:57 -04:00
KillzXGaming
cb13c0a00a Some fixes
Fixed loading files from clicked on when a single instance of the tool is used.
Fixed the UV editor, which loads materails and texture maps properly.
Adjusted loading archives which produced some duplicate file issues when the archive loads the file, and a tree node is clicked on. Ie bntx clearing, but another one would stay in memory.
Fixed bntx replacing.
2019-08-12 15:19:30 -04:00
KillzXGaming
e15e00c2c0 Adjust program to use one instance for loading files (can be disabled in config) 2019-08-11 11:10:32 -04:00
KillzXGaming
9a70890924 Msbt editor fixes 2019-08-11 10:16:32 -04:00
KillzXGaming
9f829b714b Link botw actors to msbt for defining and organsing. Load msbt labels. 2019-08-10 20:52:58 -04:00
KillzXGaming
3fd07bd46b A few more framework fixes 2019-08-10 19:29:51 -04:00
KillzXGaming
aed38de591 Finally fix the dpi scaling issues when opengl gets loaded 2019-08-10 19:20:39 -04:00
KillzXGaming
84f9811f93 Fix some tool menu extensions from the plguin 2019-08-09 21:33:26 -04:00
KillzXGaming
9e3556a5f9 More additions that seem ready for use,
Basic NCCH support, only romfs previewing for easy ripping and testing for file formats. Writing back and more improvements planned soon.
Save BTI files back.
Add structure based parsing from Kuriimu's IO extension. This will be expanded upon later to parse offsets and other things easier.
2019-08-09 18:21:16 -04:00
KillzXGaming
e5de8616d8 Some fixes 2019-08-08 20:09:58 -04:00
KillzXGaming
e0dc6bd12d KCL cleanup 2019-08-08 19:58:14 -04:00
KillzXGaming
9df93a02af KCL library fixes 2019-08-08 18:04:15 -04:00
KillzXGaming
855037d21c Fix TXE decoding with bad image sizes 2019-08-08 17:12:11 -04:00
KillzXGaming
79d78f64ad Textue importer improvements and some gui fixes 2019-08-08 15:26:08 -04:00
KillzXGaming
b5f50c824c Fix bffnt with bntx that changes the sheet size 2019-08-07 21:53:59 -04:00
KillzXGaming
feecbeef55 Image editor fixes for bffnt 2019-08-07 21:14:18 -04:00
KillzXGaming
fb2648205b Parse CTPK 2019-08-07 21:04:44 -04:00
KillzXGaming
9db860f0b8 Start to implement 3ds texture encoding. (Todo ETC1 and L4/A4) 2019-08-07 17:15:31 -04:00
KillzXGaming
c11389fb4f Fix IArchive propery file counter 2019-08-06 19:02:09 -04:00
KillzXGaming
e5bb9fa9d5 Use file streams for non archive based writing. Allow giant file saving from opened streams. 2019-08-06 17:35:18 -04:00
KillzXGaming
23324a2233 Reset the camera when the movement mode is changed 2019-08-06 16:22:24 -04:00
KillzXGaming
c559b2c674 limit dds format support properly 2019-08-05 21:35:25 -04:00
KillzXGaming
de0382a08e Adjust DDS header properly when edited 2019-08-05 21:33:42 -04:00
KillzXGaming
3ee6cd887a Support DDS editing 2019-08-05 21:30:47 -04:00
KillzXGaming
714be7d126 Fix bti 2019-08-05 21:08:04 -04:00
KillzXGaming
33fff8e4de Add in proper replacing for raw texture types 2019-08-05 18:48:14 -04:00
KillzXGaming
a655ea24d7 Rework IGZ reading and add writing back (for textures) 2019-08-05 15:38:03 -04:00
KillzXGaming
aa92482f15 Fix some dialog issues and paste the full data size for IGZ to prevent size issues 2019-08-04 21:12:36 -04:00
KillzXGaming
4eeb05e3d2 Remove libwii sharp as it's not used anymore 2019-08-04 19:57:38 -04:00
KillzXGaming
bd0953477a Decompress IGA Pak and start parsing IGZ textures 2019-08-04 19:28:32 -04:00
KillzXGaming
2a19d4c75b Improve multiple image icon loading speed 2019-08-04 14:26:52 -04:00
KillzXGaming
51e96ec1a5 Support the other normal TPL formats 2019-08-04 13:45:11 -04:00
KillzXGaming
10a3aa5017 Add suoport for SMB TPL 2019-08-04 13:31:16 -04:00
KillzXGaming
ea2b941b93 Parse TPL 2019-08-04 12:21:28 -04:00
KillzXGaming
5729b20c43 Add the latest bflyt files 2019-08-04 11:50:57 -04:00
JohnFiddleystein
dd33b5e6c5 Add support for basic BTI and TXE 2019-08-04 14:15:34 +01:00
KillzXGaming
89aecaec34 Add proper audio exporting in player 2019-08-03 18:18:26 -04:00
KillzXGaming
61ede33e29 Auto set the audio device to an active one 2019-08-03 18:00:51 -04:00
KillzXGaming
1ab2164339 Rewrite all the texture modes to use proper enums 2019-08-03 15:23:05 -04:00
KillzXGaming
231a6ee9c6 Add support for LM3DS GAR 2019-08-03 13:33:02 -04:00
KillzXGaming
e0b8ca5e27 Parse cmb materials almost completely 2019-08-02 21:24:13 -04:00
KillzXGaming
9e5e8d72b5 ZSI progress 2019-08-02 20:08:51 -04:00
KillzXGaming
95a50d03ec Fix skeleton not hiding when drawables switched 2019-08-02 17:39:00 -04:00
KillzXGaming
f06cfbd053 CMB model previewing and parsing 2019-08-02 17:27:44 -04:00
KillzXGaming
894e53ea07 Choose when to end the thread 2019-08-01 21:16:48 -04:00
KillzXGaming
72cce64583 Update the image only after decoding is entirely finished 2019-08-01 21:11:57 -04:00
KillzXGaming
531feeff78 Resize the preview automatically if the image is directly set 2019-08-01 21:05:02 -04:00
KillzXGaming
5272063ca6 Don't reload the config file to prevent settings reset if another file is opened 2019-08-01 20:48:33 -04:00
KillzXGaming
de20881676 Update single texture based image icons 2019-08-01 20:02:38 -04:00
KillzXGaming
b445590961 Add preview to single textures (ie NUTEXB) 2019-08-01 19:28:37 -04:00
KillzXGaming
e2edd2e923 Load texture icons via before expand event 2019-08-01 19:16:50 -04:00
KillzXGaming
a9b92e42e2 Some platform swizzle fixes and preview textures for bmd 2019-08-01 18:11:56 -04:00
KillzXGaming
f4e4afa2f7 Cleanup. Start to impliment texture preview icons in tree 2019-08-01 17:47:35 -04:00
KillzXGaming
aa006fd389 Fix double click again because windows keeps breaking it from generated code 2019-08-01 09:22:35 -04:00
KillzXGaming
c4a2c3f7e1 Some form fixes 2019-07-31 21:13:58 -04:00
KillzXGaming
ccde8d3276 Add option to dock the search panel 2019-07-31 21:11:06 -04:00
KillzXGaming
d744e0b339 Update mainform for file format adding to editor 2019-07-31 20:42:40 -04:00
KillzXGaming
9c98ff2c83 Load IArchives if added to object editor 2019-07-31 20:40:16 -04:00
KillzXGaming
d244ceab0a Add proper file remove dialog and update the menus 2019-07-31 20:27:46 -04:00
KillzXGaming
2340d6a7a4 Improve file removing from object editor 2019-07-31 20:11:10 -04:00
KillzXGaming
25bc66e505 Support loading multiple IArchive and node types from a single format within an archive file 2019-07-31 19:45:03 -04:00
KillzXGaming
2df6d35d17 Add interface to not dispose data (for NSP, NCA, XCI, etc) 2019-07-31 19:33:45 -04:00
KillzXGaming
116d114c77 Make double click optional on searching nodes 2019-07-31 17:53:26 -04:00
KillzXGaming
f376f16dcc Dispose of the search window iif the object editor is closed 2019-07-31 17:48:31 -04:00
KillzXGaming
c83d7e7f1e Fix treeview not firing double click event, ops 2019-07-31 17:31:50 -04:00
KillzXGaming
d19aa09c32 More improvements for searching 2019-07-31 17:25:41 -04:00
KillzXGaming
01d74e3839 Add functional search window 2019-07-31 17:08:00 -04:00
KillzXGaming
4576364e13 Disable opengl on very old opengl versions to prevent crashes 2019-07-30 16:24:10 -04:00
KillzXGaming
8afae95e2c Fix vertex increase from assimp's tans/bitans (calculate with ST) 2019-07-30 15:38:42 -04:00
KillzXGaming
030f9effc2 Fix null parameters 2019-07-29 16:48:24 -04:00
KillzXGaming
326b11aef6 More format fixes. Add custom parameters for not swapping red and green channels 2019-07-29 15:48:36 -04:00
KillzXGaming
e1d9dff336 Force ptcl for wii u to generate mip offsets 2019-07-29 15:05:50 -04:00
KillzXGaming
f58efacbef Automatically generate GX2 mipoffsets if null or empty 2019-07-29 14:55:43 -04:00
KillzXGaming
691d4c7d35 Decompress hyrule warriors (Wii U) gz files 2019-07-29 14:40:12 -04:00
KillzXGaming
4ef0025fe2 Add color/alpha preview combo as a control 2019-07-29 12:23:15 -04:00
KillzXGaming
dd273d88ed Rework ptcl color handling so it works better 2019-07-29 11:19:34 -04:00
KillzXGaming
f70a18c3f8 Add option to export all GT1 textures 2019-07-29 10:54:19 -04:00
KillzXGaming
ce85ad3835 Add GT1/G1T support 2019-07-28 21:58:28 -04:00
KillzXGaming
2af2b11ad5 Add proper folding to text edtior and align margins better 2019-07-28 18:44:18 -04:00
KillzXGaming
dc20d5eac3 Add xml editor tab for byaml 2019-07-28 17:10:40 -04:00
KillzXGaming
e7c0876517 Camera improvements and adjust viewport toolbar 2019-07-28 15:14:40 -04:00
KillzXGaming
e346f26b5f Basic WASD camera movement 2019-07-28 13:59:53 -04:00
KillzXGaming
9011f2a4c7 Try to dispose rarc properly 2019-07-28 12:45:39 -04:00
KillzXGaming
2ac0fcef2d
Adjust bc5 channel settings 2019-07-27 22:25:26 -04:00
KillzXGaming
2da0d605fe Fix loading 3ds bflim 2019-07-27 21:05:12 -04:00
KillzXGaming
f599ea9b41 Add parameters class to textures to configure how to display the texture 2019-07-27 18:25:35 -04:00
KillzXGaming
64be5b2408 More buffer and exploding fixes for LM2 2019-07-27 14:48:55 -04:00
KillzXGaming
25aa49cc29 Some fixes for file paths for newly added files 2019-07-26 21:30:51 -04:00
KillzXGaming
e15aa39eb9 Some archive fixes 2019-07-26 16:44:22 -04:00
KillzXGaming
df9641faab Bfres library fixes, and some form fixes 2019-07-26 15:35:15 -04:00
KillzXGaming
76c0b560ad restet saved lists for rarc on save 2019-07-25 20:56:28 -04:00
KillzXGaming
eb288d36b9 More rarc fixes 2019-07-25 18:54:58 -04:00
KillzXGaming
e0df03cc26 Wip zar, gar,, and more rarc saving progress 2019-07-25 16:49:04 -04:00
KillzXGaming
40c0fcae11 Try to fix the file loader disposing streams 2019-07-25 14:31:33 -04:00
KillzXGaming
5582f31c38 Add option to export lm2 dark moon models 2019-07-25 09:36:49 -04:00
KillzXGaming
1fb66d4490 Always dispose file streams once everything is loaded 2019-07-24 21:15:21 -04:00
KillzXGaming
4ba79980c9 Automatically clear the playlist for the audio player to prevent dupes 2019-07-24 17:42:59 -04:00
KillzXGaming
fdca563b07 Fix reference path 2019-07-24 17:30:51 -04:00
KillzXGaming
c7614bc9b4 Another adjustment 2019-07-24 16:57:00 -04:00
KillzXGaming
8221aa98fd Fix configuration for release build 2019-07-24 16:47:44 -04:00
KillzXGaming
a386d2e85e Adjust direct x tex 2019-07-24 15:50:46 -04:00
KillzXGaming
cd0e3377b4 Sarc fixes and more windows 7 fixes 2019-07-24 15:10:05 -04:00
KillzXGaming
9e1613d946 Update filenames for archives if the file is not saved by tree dialog 2019-07-23 20:52:38 -04:00
KillzXGaming
9180bb1cf2 Direct X tex fixes for windows 7 and 8 2019-07-23 20:42:57 -04:00
KillzXGaming
f9395b2144 Fix build issues 2019-07-23 19:03:52 -04:00
KillzXGaming
82d96d4a73 Return raw bytes for compressing without direct x tex 2019-07-22 21:18:52 -04:00
KillzXGaming
eac9022938 Fix files in archives not compressing back 2019-07-22 21:01:05 -04:00
KillzXGaming
8be02596e6 More adjustments 2019-07-22 19:01:29 -04:00
KillzXGaming
667ec7c752 rgba8 channel fix for non direct x tex 2019-07-22 18:26:23 -04:00
KillzXGaming
e7256f607a Adjust decoding rgb8 without direct x tex 2019-07-22 16:48:15 -04:00
KillzXGaming
68a3933362 Draw LM2 models. Extreemly glitchy atm 2019-07-22 16:44:03 -04:00
KillzXGaming
1429a00178 More fixes and additions
Archives now use a link list for archive infos and treenodes. Handling replaced treenodes is easier and fixes renaming issues if a file was opened and renamed.
More LM2 archive improvements, with more chunk loading.
2019-07-22 15:06:49 -04:00
KillzXGaming
571dad0776 Some archive fixes 2019-07-21 14:58:57 -04:00
KillzXGaming
ba6fef722d Adjust the vertex color view to clamp values above 255 2019-07-21 14:51:50 -04:00
KillzXGaming
976c214799 Add option to always dispay all models 2019-07-21 14:09:25 -04:00
KillzXGaming
d25d10c22b Fix LM2 textures with multiple image blocks 2019-07-21 13:25:18 -04:00
KillzXGaming
8d2b2c0d4d Load sonic all stars racing transformed archives for PC 2019-07-21 10:29:54 -04:00
KillzXGaming
ee5f01e44d Add sonic all stars transformed archive as it's basically an older version of SP2 2019-07-20 20:56:22 -04:00
KillzXGaming
419a76a508 Fix btye order for image decoding gc images 2019-07-19 17:24:54 -04:00
KillzXGaming
0699a50408 Another fix for .anim with keyed frames 2019-07-19 16:45:19 -04:00
KillzXGaming
c4279e6404 Fix some anim exporting issues 2019-07-19 16:05:53 -04:00
KillzXGaming
395a9bd65d Some dds edit fixes 2019-07-19 15:39:25 -04:00
KillzXGaming
da46126e8b Update image editor properly if edited 2019-07-19 15:27:30 -04:00
KillzXGaming
c0c1e621a4 A few additions and fixes
Add custom color option for image editor background.
Start on character exporting for bffnt. as xlor.
Fix sarc hashes.
Fix bflims in archive editors
2019-07-19 15:11:55 -04:00
KillzXGaming
643ccb24d0 Add additional sarc extension for botw font 2019-07-18 20:02:37 -04:00
KillzXGaming
64639c4886 Add option to make new sarcs 2019-07-18 19:19:16 -04:00
KillzXGaming
557fb17232 Option to add new folders to IArchives 2019-07-18 18:16:45 -04:00
KillzXGaming
38af392160 Clear IArchive files properly 2019-07-18 18:05:27 -04:00
KillzXGaming
e5b57de5e8 Fix sorting bone weights with duplicate indices 2019-07-18 17:50:46 -04:00
KillzXGaming
4428dd20ef File check fixes if the position is too big for base stream 2019-07-18 17:14:09 -04:00
KillzXGaming
b6de4bf6a4 Properly check for text converting support for archive files 2019-07-18 16:55:41 -04:00
KillzXGaming
043983fdad Set the file format instance on editor load for saving back 2019-07-18 16:52:46 -04:00
KillzXGaming
1a420f65a3 Fix save button for archive editors 2019-07-18 16:48:52 -04:00
KillzXGaming
2e55d789ae Add the newest archive stuff to sarc 2019-07-18 16:42:27 -04:00
KillzXGaming
49ab034d46 Adjus bc5 decoder to prevent errors on re encoding 2019-07-18 15:58:50 -04:00
KillzXGaming
7dc00e4bf3 Tons more bffnt progress. Adjust assimp version to fix issues 2019-07-18 13:33:16 -04:00
KillzXGaming
ff9c598d99 Add IContextMenuContainers to IArchives 2019-07-17 19:59:17 -04:00
KillzXGaming
80655a6aaa Parse cmap sections, and add a block check 2019-07-17 19:01:06 -04:00
KillzXGaming
aa0bbfc57c Fix exporting individual levels as dds for bffnt 2019-07-17 16:42:47 -04:00
KillzXGaming
9b15a3d5fe Some bffnt stuff 2019-07-17 16:14:55 -04:00
KillzXGaming
9e01d29127 Update direct x tex 2019-07-16 18:39:17 -04:00
KillzXGaming
6cfb6a214f Adjust the toolbox name to no longer include "Switch" in it. 2019-07-16 17:35:21 -04:00
KillzXGaming
43081a4086 Texture decoder cleanup. Also fix wii u texture patterns with null issues 2019-07-16 16:54:46 -04:00
KillzXGaming
ea26ebc82f Attribute fixes for bfres and gmx 2019-07-15 15:41:02 -04:00
KillzXGaming
b50d8925e4 Some gmx and bmd fixes 2019-07-14 21:08:47 -04:00
KillzXGaming
4a87ceb8a0 More fixes to tex regs 2019-07-14 19:16:36 -04:00
KillzXGaming
7e89e63fe3 More swizzle adjustments 2019-07-14 18:59:52 -04:00
KillzXGaming
df1ec92e92 Fix illegal character check for exporting in iarchive files 2019-07-14 18:17:45 -04:00
KillzXGaming
ddcf80a6d7 More gx2 reg fixes 2019-07-14 18:13:00 -04:00
KillzXGaming
f84753aa11 Add viewer for TPHD file tables 2019-07-14 17:36:52 -04:00
KillzXGaming
cd4a9f1788 Generate GX2 tex registers 2019-07-14 16:43:08 -04:00
KillzXGaming
7bf92f8fc4 Reinstall assimp 2019-07-14 14:39:02 -04:00
KillzXGaming
3312f5ab00 Another shortcut adjustment 2019-07-14 12:58:42 -04:00
KillzXGaming
a2f01c7748 Fix double click event for treeview 2019-07-14 12:57:07 -04:00
KillzXGaming
8a89bce579 Check ctrl key for shortcuts 2019-07-14 12:51:51 -04:00
KillzXGaming
ff8b6bccc8 Check the node on key down to check if shortcut has been used 2019-07-14 12:13:09 -04:00
KillzXGaming
11c850ba77 Fix a dumb error 2019-07-13 19:25:55 -04:00
KillzXGaming
1f9b82ddda Fix double clicking window title bar to go full screen 2019-07-13 19:25:41 -04:00
KillzXGaming
7e3b2c16da Adjust default bntx format 2019-07-13 18:22:47 -04:00
KillzXGaming
631f59ef93 Add audio meta data icons 2019-07-13 15:54:39 -04:00
KillzXGaming
716e2c254f Start on SMO kingdom loading 2019-07-13 10:56:21 -04:00
KillzXGaming
384185ab4a Start on scene loader 2019-07-13 09:58:44 -04:00
KillzXGaming
5fc6522449 Add more bmd material conversion. Reorder bmd object draw, and check transparency 2019-07-12 21:48:56 -04:00
KillzXGaming
530c86e672 Use bmd cull modes 2019-07-12 20:13:27 -04:00
KillzXGaming
1becccb4ec Map bmd materials by index rather than name for opengl 2019-07-12 17:53:57 -04:00
KillzXGaming
d87426fbd8 bmd fixes and fix image editor issues 2019-07-12 15:28:14 -04:00
KillzXGaming
134eff9401 More BMD fixes and adjustments 2019-07-11 20:23:47 -04:00
KillzXGaming
9c5917cc6a Load bmd textures to opengl 2019-07-11 19:51:28 -04:00
KillzXGaming
7f679b9fa6 Add bmd drawing 2019-07-11 19:38:29 -04:00
KillzXGaming
5081e39414 More format additions and fixes.
Fixed MKAGPDX models a bit so they aren't all missing mesh data. Skinned ones are still buggy!
 BMD wip support using SuperBMDLib.
 Adjusted gui loading a little bit.
2019-07-11 17:22:59 -04:00
KillzXGaming
e5b0b71eaa Fix multiple ptcl issues with rebuilding. Add some GCN formats 2019-07-10 20:38:35 -04:00
KillzXGaming
a28606e150 Fix some ptcl saving issues from bfres having null data 2019-07-10 19:21:53 -04:00
KillzXGaming
d191d9c393 Cleanup. Prepare some functions 2019-07-09 20:25:32 -04:00
KillzXGaming
ca5d0316c9 Many more texture pattern editor improvements 2019-07-09 20:13:39 -04:00
KillzXGaming
8defebe175 Add additional bytes for RSTB entries to prevent issues 2019-07-09 17:59:58 -04:00
KillzXGaming
bb22dc8483 Texture pattern editor overhaul. Not functional yet! 2019-07-09 17:50:50 -04:00