Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-12-24 20:03:08 +00:00
Code Issues Projects Releases Packages Wiki Activity
1090 commits 2 branches 4 tags 752 MiB
Commit graph

585 commits

Author SHA1 Message Date
KillzXGaming
e51fb070c6 Start adding conversion methods for automatic wii u - switch conversion and vice versa 2019-06-01 18:15:48 -04:00
KillzXGaming
7cb5885e6f More archive improvements 2019-06-01 17:49:39 -04:00
KillzXGaming
60a1e52dfe Fix error dialog label size 2019-06-01 15:16:39 -04:00
KillzXGaming
4d7171605b Add option to remove unused textures on save. 2019-06-01 12:30:17 -04:00
KillzXGaming
d46df12ecf Default the compression mode for BC7 to fast if edited via default program feature. 2019-06-01 09:28:07 -04:00
KillzXGaming
60ffca8e2b One last fix 2019-05-31 20:29:45 -04:00
KillzXGaming
40cb06cb86 Fix pixel types not being read properly 2019-05-31 20:24:48 -04:00
KillzXGaming
201739dcb6 Some fixes for parsing 2019-05-31 20:20:07 -04:00
KillzXGaming
ffa130a98b Set the shader type properly 2019-05-31 19:14:25 -04:00
KillzXGaming
01ae391de6 Add NUSHDB shader file. 2019-05-31 19:08:55 -04:00
KillzXGaming
3dd300e15f Make sure to use the right GX2 swizzling code so i don't break anything 2019-05-31 17:21:13 -04:00
KillzXGaming
a3a6f9b98e Load the x64 folder for direct x tex by default as it causes issues without. 2019-05-31 17:12:23 -04:00
KillzXGaming
da15dc55fc Don't use legacy by default. 2019-05-31 15:45:21 -04:00
KillzXGaming
ed2a3b8041 Disable opengl texture loading for legacy 2019-05-31 15:38:49 -04:00
KillzXGaming
921b267b44 Improve legacy support and a few fixes. 
Cursor for param editing doesn't reset anymore to the top right of the screen.
Fixed some direct c tex issues with loading.
 2019-05-31 15:08:14 -04:00
KillzXGaming
94602f3671 Another adjustment so more games can detect transparency 2019-05-30 21:59:22 -04:00
KillzXGaming
7682a827cc Also add material icons for tranparent toggle in render state 2019-05-30 21:46:00 -04:00
KillzXGaming
31b2ab8260 Add material icons for transparent and translucent things. 2019-05-30 21:42:23 -04:00
KillzXGaming
2299a61cb3 Fix displaying normals as lines if enabled 2019-05-30 19:34:23 -04:00
KillzXGaming
250e267143 Fix normals from being dark or flat sometimes. 2019-05-30 19:12:38 -04:00
KillzXGaming
b12bb34082 Another fix to prevent issues with path saving 2019-05-30 18:02:51 -04:00
KillzXGaming
3b4bb242c5 Starto to add material presets. Add option to add empty meshes 2019-05-30 15:28:43 -04:00
KillzXGaming
f1164934d2 Apply any material edits before exported so it keeps the changes 2019-05-29 19:06:31 -04:00
KillzXGaming
39c021913c Some crash fixes when adding embedded files and placeholder textures. 2019-05-29 16:38:19 -04:00
KillzXGaming
d1c32844d1 Fix skeleton issues. More archive improvement. 2019-05-29 14:24:24 -04:00
KillzXGaming
be19e8e2e2 Add archive check for extracting files with illegal characters 2019-05-28 16:53:02 -04:00
KillzXGaming
d2db5c1c68 Fix filename for generic archive exporting 2019-05-28 16:46:33 -04:00
KillzXGaming
57c1af7022 Add functions to export data properly for generic archives 2019-05-28 16:43:57 -04:00
KillzXGaming
6999a6debf Add SP2 archive stuff 2019-05-28 16:11:40 -04:00
KillzXGaming
f787c59627 Add setting to limit vertex skin to better help prevent crashes 2019-05-27 20:02:57 -04:00
KillzXGaming
d743d39efc Some adjustments and fixes 2019-05-27 18:00:03 -04:00
KillzXGaming
cf793044ae A few more fixes 2019-05-26 20:46:08 -04:00
KillzXGaming
2fc0467d9b Fixes for importing new bones or creating new ones from skeleton parent 2019-05-26 20:44:39 -04:00
KillzXGaming
e3a410a75a More adjustments 2019-05-26 15:33:16 -04:00
KillzXGaming
553fe25df5 More fixes 2019-05-26 13:28:30 -04:00
KillzXGaming
775e689dda Add save improvements to all animation types for wii u 2019-05-26 13:22:20 -04:00
KillzXGaming
7467818d66 Improve saving bfres with tons of animations 2019-05-26 13:09:44 -04:00
KillzXGaming
d6be976701 Don't make the skeleton necessary for .anim 2019-05-26 11:59:17 -04:00
KillzXGaming
c92988e909 Update filters 2019-05-26 11:56:42 -04:00
KillzXGaming
7bad5175ef Now seanim animation imports should work 2019-05-26 11:48:30 -04:00
KillzXGaming
3ffc7d7f6d More seanim fixes 2019-05-26 11:39:34 -04:00
KillzXGaming
9b0883150a More progress on seanim importing 2019-05-26 11:32:12 -04:00
KillzXGaming
8fc4ae525e Cleanup smd a bit 2019-05-26 11:02:07 -04:00
KillzXGaming
6afb66932b Fixup smd exporting and add importing smd back 2019-05-26 10:56:23 -04:00
KillzXGaming
85b8e6bba1 Use linear curves for now until i fix some bugs with cubic 2019-05-25 21:54:52 -04:00
KillzXGaming
f9fbd19b82 Fix error from bad key count 2019-05-25 21:33:34 -04:00
KillzXGaming
8b04c55c32 Add anim importing 2019-05-25 21:07:00 -04:00
KillzXGaming
e7111fbd49 Fix export all to choose the right extension 2019-05-25 15:34:40 -04:00
KillzXGaming
e653ed1044 Another fix to prevent name issues 2019-05-25 15:12:51 -04:00
KillzXGaming
6d03b4da88 More fixes for param exporting and filters 2019-05-25 15:11:01 -04:00
KillzXGaming
35f6b182e1 Fix an error when creating a new model with skeleton 2019-05-25 14:33:21 -04:00
KillzXGaming
f6c7ff684f Allow negative angles 2019-05-25 14:30:33 -04:00
KillzXGaming
e720214b5e Add option to configure the rotation of the bones manually 2019-05-25 14:27:39 -04:00
KillzXGaming
60fd66a27d Quick fix for exporting the X axis on scale, offset is wrong 2019-05-25 13:26:55 -04:00
KillzXGaming
e171af5448 Fix chr0 exporting finally 2019-05-25 13:25:30 -04:00
KillzXGaming
7e16f21975 Add .anim support from forge for testing, and fix export filter 2019-05-25 13:03:54 -04:00
KillzXGaming
d4c6ddb3da More fixes for converting 2019-05-25 11:33:51 -04:00
KillzXGaming
16ae15328d Fix Wii U converting to switch fska (Also fixes chr0 importing for wii u bfres) 2019-05-24 21:30:02 -04:00
KillzXGaming
d1e2b05b51 More adjustments 2019-05-24 21:21:47 -04:00
KillzXGaming
df8d1f986c Cleanup 2019-05-24 21:03:31 -04:00
KillzXGaming
a4459533ec More exporting fixes 2019-05-24 20:55:55 -04:00
KillzXGaming
67f6703862 Clear base values if a key exists on the first frame for exporting chr0 2019-05-24 18:04:27 -04:00
KillzXGaming
10c9973527 Fix export filter for animations 2019-05-24 17:47:13 -04:00
KillzXGaming
29ce2112fb More chr0 exporting fixes 2019-05-24 17:42:10 -04:00
KillzXGaming
9ad90e3b15 Some progress on chr0 exporting 2019-05-24 17:34:37 -04:00
KillzXGaming
46aca404a1 Make tex2 generate mip maps if not found preventing any possible errors 2019-05-24 15:59:52 -04:00
KillzXGaming
2a92afa122 Chr0 animation importing, dae exporting and tons more improvements! 
Chr0 can be imported/replaced.
More fixes to importing sections including some errors and proper filtering.
Dae epxorting now has a progress bar and an option to idsable texture exporting.
Bfska can now be swapped between platforms. More sections will handle this method soon!.
Fixed spaces on files from "Export All".
Display multiple texture maps in bcres materials
 2019-05-24 15:15:35 -04:00
KillzXGaming
f9df905cbc Quick fix for nsmbudx not mapping textures right 2019-05-22 17:37:42 -04:00
KillzXGaming
53f37afde1 Fix not showing the last key frame in the animation editors. 2019-05-22 16:49:17 -04:00
KillzXGaming
3234e3a817 Adjust param editor to display colors for multi tex, and fix header 2019-05-22 15:59:37 -04:00
KillzXGaming
3a85f06ac7 Tons more DDS fixes from yesterday. RGB textures also aren't blue anymore. 2019-05-22 15:26:25 -04:00
KillzXGaming
a921e46a8f Add choice to reset camera by model or default camera position 2019-05-21 18:29:12 -04:00
KillzXGaming
6d7579e6e0 More improvements. 
Camera is now centerd when a bfres is selected. This will apply to reseting the camera aswell. The method is based on Smash Forge so thanks to the devs for it.
Start on bfsha program linking for bfres materials. Dunno how far i'll take this.
Basic ortho mode added. Needs improvements to zoom in and mainly just changes the projection matrix to ortho atm. Controls are not altered.
 2019-05-21 18:08:57 -04:00
KillzXGaming
50586ef978 Fix binary shape importing for switch 2019-05-20 20:03:39 -04:00
KillzXGaming
d0fa47a959 Add same improvements to the gx2 texture importer 2019-05-20 19:29:39 -04:00
KillzXGaming
9c6d3883cf Only compress a texture once if loaded in texture importer 2019-05-20 19:21:00 -04:00
KillzXGaming
02de27faad More fixes for BC7 compression speed 2019-05-20 18:48:49 -04:00
KillzXGaming
0536f1a225 Default bc7 compression mode to fast 2019-05-20 18:22:25 -04:00
KillzXGaming
cedaac5518 Fix deleting materials causing index issues for shapes 2019-05-20 16:59:47 -04:00
KillzXGaming
0e72164823 Load bones the same way 2019-05-20 16:10:57 -04:00
KillzXGaming
bccb8f3af4 Optmize model/shader loading for bfres. Save block setting to 1MB for KSA to not crash 2019-05-20 16:01:43 -04:00
KillzXGaming
e6c911f026 Add byaml endianness converter in tools menu. Fix byaml with path nodes. 2019-05-19 17:50:21 -04:00
KillzXGaming
49314b2842 Fix bntx and switch bfres causing corruption or crashes 2019-05-19 14:25:37 -04:00
KillzXGaming
82d68152f9 More adjustments 2019-05-18 18:37:05 -04:00
KillzXGaming
e51b1e2382 Adjustments for anims 2019-05-18 17:55:22 -04:00
KillzXGaming
8b00b8430e Adjust file format to save changes for new generic archives. 2019-05-18 13:36:39 -04:00
KillzXGaming
bcd21b9e4f Fix duped key issue with sarc 2019-05-18 13:17:43 -04:00
KillzXGaming
387e8685fd Automatically apply changes when resized in image editor 2019-05-18 12:24:03 -04:00
KillzXGaming
6c38b46ad4 Add checks for enabling certain content menus 2019-05-18 11:22:18 -04:00
KillzXGaming
7e8cfcd16c Start to add folder operations for improved archive support 2019-05-18 11:13:14 -04:00
KillzXGaming
ffdb042c3f Improve zlib support. Add NXARC 2019-05-18 10:06:09 -04:00
KillzXGaming
b759a293fe Some adjustments for animations 2019-05-17 21:09:24 -04:00
KillzXGaming
bffd69b81f More fixes for byml. Fix build errors 2019-05-17 20:35:40 -04:00
KillzXGaming
5654105016 Allow multiple window dialogs for sarc archives 2019-05-17 18:02:46 -04:00
KillzXGaming
2c265c876d Improe channel import/replacer 2019-05-17 15:50:03 -04:00
KillzXGaming
cd721af0eb DDS fixes. Add BC7 normal mode for slower but better quality compression 2019-05-17 15:35:10 -04:00
KillzXGaming
b64e744d26 Add UV channel toggle for uv test pattern shading in settings window 2019-05-16 21:26:32 -04:00
KillzXGaming
a0dd1b4f22 Fix normals on mario's hands in costume selector 2019-05-16 19:25:41 -04:00
KillzXGaming
576da8c6e4 Fix some diffuse colors from pbr 2019-05-16 19:10:01 -04:00
KillzXGaming
304b00fe49 More PBR improvements. Fix skybox to be a proper skybox 2019-05-16 16:01:22 -04:00
KillzXGaming
9767d71f75 Update custom cubemaps on viewport if changed 2019-05-15 19:54:45 -04:00
KillzXGaming
11fe38a49a Use local time for github update list 2019-05-15 16:36:22 -04:00
KillzXGaming
cd57a856fc Add improvements from yesterday. 
PBR shader slghtly improved.
Skyobx toggle now works while viewport is active,
Cubemaps now have a check wether or not the file given is a valid cube map dds.
Update column sizing so forms load much faster
Option to right click and clear paths in settings if set
 2019-05-15 15:35:05 -04:00
KillzXGaming
82040c6913 Add odyssey costume selector/viewer 2019-05-14 21:43:37 -04:00
KillzXGaming
8f35052887 If textures don't exist in the bfres, uncheck placeholder option as there isn't a way to tell if they can be used 2019-05-14 20:41:03 -04:00
KillzXGaming
85cd8dcafc Make placeholder textures optional on import 2019-05-14 20:27:14 -04:00
KillzXGaming
b4fde67c82 More improvements. Add option to fill image with color. 2019-05-13 20:20:26 -04:00
KillzXGaming
67d1b6920a Some improvements from yesterday. Start to improve uv editor. 
Basic tex 3ds support
BC4 textures will be rendered grayscale in opengl (not using opengl decoder)
Fix a few format issues with 3ds
Mip total method is one function in STGeneric texture
Weight format default to floats again until i find a proper fix for the 888 unform format.
 2019-05-13 15:29:40 -04:00
KillzXGaming
a1273c86dc Fix color for unused param colors 2019-05-12 18:20:00 -04:00
KillzXGaming
29ad8dee78 Some adjusments. Add option to hide all fmdls with rightclicking folder 2019-05-12 18:10:33 -04:00
KillzXGaming
c11ebce612 Fix texture names on import having improper names in some special cases. 2019-05-12 16:53:55 -04:00
KillzXGaming
459bd5d247 Add supported format list for bffnt 2019-05-12 13:09:08 -04:00
KillzXGaming
7e855caa47 Start to save bffnt back. Not finished yet 2019-05-12 13:02:39 -04:00
KillzXGaming
617eafb99a Fix BFFNT with mulltiple images 2019-05-12 12:17:57 -04:00
KillzXGaming
f62ad21e7d Improve material param list to support higher param color values than 1 2019-05-12 12:06:54 -04:00
KillzXGaming
83b2f69fb0 Update render info and user data lists for bfres properly 2019-05-12 12:00:50 -04:00
KillzXGaming
078c841190 Fix shader options not editng or saving back 2019-05-12 11:52:36 -04:00
KillzXGaming
5c605ead3f Fix dialog to remove sampler/attribute inputs 2019-05-12 11:34:09 -04:00
KillzXGaming
0b2dd29bae Fix sampler saving and lod options for wii u samplers 2019-05-12 11:26:05 -04:00
KillzXGaming
a2d23b0d43 Fix input order 2019-05-12 10:52:47 -04:00
KillzXGaming
47d79b812e Fix sampler/attribute input editor 2019-05-12 10:46:41 -04:00
KillzXGaming
69f25781a1 Load bcres editor on node select 2019-05-11 22:05:18 -04:00
KillzXGaming
d90e852e5e Fix material editor for bfres 2019-05-11 21:58:23 -04:00
KillzXGaming
4291782a89 Nul check bone index list 2019-05-11 21:54:20 -04:00
KillzXGaming
7f897fc590 Add mesh selection for bcres 2019-05-11 21:47:27 -04:00
KillzXGaming
7779e8cce4 Display bone weights on select for bcres properly 2019-05-11 21:41:32 -04:00
KillzXGaming
3b445272db Load bone weights and indices properly for bcres 2019-05-11 21:17:49 -04:00
KillzXGaming
059b406128 Update generic archive class with node wrapper and conversion 2019-05-11 20:51:23 -04:00
KillzXGaming
9e4949d5ef Use vertical orientation for texture map view 2019-05-11 20:08:01 -04:00
KillzXGaming
3c4d6a51a4 Support wrap and filters for bcres texture maps. 2019-05-11 20:05:27 -04:00
KillzXGaming
6ddd47e573 Some adjustments 2019-05-11 19:11:13 -04:00
KillzXGaming
4171ca9007 Fix bcres UVs 2019-05-11 18:49:32 -04:00
KillzXGaming
1118111b7e Color fix for opengl 3ds textures 2019-05-11 18:36:10 -04:00
KillzXGaming
0c5a43aab0 Export tex1 properly even without tex2 2019-05-11 18:26:18 -04:00
KillzXGaming
032e09d5a6 Load textures in viewport for bcres 2019-05-11 18:17:35 -04:00
KillzXGaming
59adf0f60e Adjust blank names 2019-05-11 16:19:39 -04:00
KillzXGaming
ba6790abf5 Draw bcres and add more improvements 2019-05-11 16:11:27 -04:00
KillzXGaming
67d17a5a11 Improve bcres editor. Start to add drawing 2019-05-11 13:10:39 -04:00
KillzXGaming
7f35cce88f Add proper boen rename check 2019-05-11 12:38:24 -04:00
KillzXGaming
7632cc10da Add more aamp hashes 2019-05-11 12:31:50 -04:00
KillzXGaming
c648a78de9 More adjustments ot prevent crash issues 2019-05-11 12:09:06 -04:00
KillzXGaming
3c32da00a2 More fixes with switch bones 2019-05-11 11:48:54 -04:00
KillzXGaming
cdc9f2d697 Fix the bone index for rigid indices in the list 2019-05-11 11:28:33 -04:00
KillzXGaming
53e64e1288 Calculate rigid indices accurately 2019-05-11 11:26:54 -04:00
KillzXGaming
00362747fc Fix string entries not converting to yaml 2019-05-11 10:29:58 -04:00
KillzXGaming
f36451a9eb More aamp fixes 2019-05-11 10:26:10 -04:00
KillzXGaming
9574432edc Support quat types for aamp 2019-05-11 10:23:41 -04:00
KillzXGaming
5e50805a94 Generate smooth/rigid index list. Add toggle for the types 2019-05-10 21:08:10 -04:00
KillzXGaming
6c03f983c2 Display multiple sheets 2019-05-10 19:43:58 -04:00
KillzXGaming
c656416474 Support multiple sheet blocks 2019-05-10 19:39:00 -04:00
KillzXGaming
6e02fbea4b Support Wii U BFFNT 2019-05-10 19:26:45 -04:00
KillzXGaming
827e02892a Keep the same depend index for shader params (Fix WWHD crashing) 2019-05-10 17:51:59 -04:00
KillzXGaming
d4419ec67a More fixes 2019-05-09 16:14:42 -04:00
KillzXGaming
f48529590c load bcres parent 2019-05-09 16:09:47 -04:00
KillzXGaming
880e48f35d Add more editors 2019-05-09 16:05:17 -04:00
KillzXGaming
d56e49f924 Clean up 2019-05-09 15:43:20 -04:00
KillzXGaming
2eab9c2532 Load mip maps for bcres properly 2019-05-09 15:41:41 -04:00
KillzXGaming
9db8a77afe Fix BCRES library issues 2019-05-09 15:16:46 -04:00
KillzXGaming
ff967bf0c3 Update some files 2019-05-09 14:59:06 -04:00
KillzXGaming
b67de2ae9f Fix wii u bfres rebuilding 2019-05-08 17:30:29 -04:00
KillzXGaming
e744b3de26 Prepare some archive format rework 2019-05-08 16:28:04 -04:00
KillzXGaming
f1e4124066 More fixes for bone transforms 2019-05-07 21:55:24 -04:00
KillzXGaming
f86cb89716 Try to fix quat and euler settings for bones 2019-05-07 21:43:38 -04:00
KillzXGaming
d33882b029 Bfres library fixes. 
Fixed user data not relocating with proper padding.
Alignment for botw is handled a bit differently in attempt to keep the file sizes accurate
 2019-05-07 21:07:58 -04:00
KillzXGaming
bcd77f29ca Add support for old 3ds ptcl versions 2019-05-06 19:13:16 -04:00
KillzXGaming
db39432a88 Another fix for duped mesh names 2019-05-06 17:35:41 -04:00
KillzXGaming
e160f4cdc1 Fix dupe name checking on bones and shapes 2019-05-06 17:32:26 -04:00
KillzXGaming
72579451b8 Fix bone names on import and some import errors 2019-05-06 17:19:07 -04:00
KillzXGaming
9005b9ee0f Load 3ds emitters and some fixes 2019-05-05 20:50:15 -04:00
KillzXGaming
e3284f0a84 More fixes with wii u bone importing and updating matricies for custom bones 2019-05-05 18:16:41 -04:00
KillzXGaming
e50666be9e More fixes for local transform errors 2019-05-05 17:36:44 -04:00
KillzXGaming
9c567dc89c Return original position if determinant is 0 for local transform. 2019-05-05 17:32:32 -04:00
KillzXGaming
a9e7e03455 More fixes 2019-05-05 15:34:29 -04:00
KillzXGaming
44c051d447 Optimize bone attribute formats based on skin count 2019-05-05 13:37:36 -04:00
KillzXGaming
80c316b740 Alter default format to be 8888_UNORM for weights again. 2019-05-05 13:13:00 -04:00
KillzXGaming
6bc0d562f2 Set zoom settings on load 2019-05-05 12:37:34 -04:00
KillzXGaming
59ab2acfd1 Save settings when changed 2019-05-05 12:34:35 -04:00
KillzXGaming
b6da2b236d Add image box control with zoom feature 2019-05-05 12:31:44 -04:00
KillzXGaming
758e922183 Cleanup and fixes 2019-05-04 21:20:47 -04:00
KillzXGaming
85c5051b36 Apply assimp matrix properly 2019-05-04 20:40:37 -04:00
KillzXGaming
76799de193 Prevent passing bad settings if textures are scrolled quickly 2019-05-04 19:36:00 -04:00
KillzXGaming
af7d563abb Reselect setting if unselected and is altered 2019-05-04 19:30:37 -04:00
KillzXGaming
c48b2a3f02 Update texture editors with theme controls. Add 3DS texture importer 2019-05-04 19:21:37 -04:00
KillzXGaming
57c7795aaa Add more editor options for bflim 2019-05-04 18:19:08 -04:00
KillzXGaming
8962f34e50 Load components by default now 2019-05-04 17:38:51 -04:00
KillzXGaming
52cddcac75 Disable property change even on load to speed up image loading 2019-05-04 16:48:45 -04:00
KillzXGaming
4fe9860945 Check magic for checking 3ds ptcl 2019-05-04 16:03:49 -04:00
KillzXGaming
7cec448cd0 Fix duplicate meshes 2019-05-04 15:53:05 -04:00
KillzXGaming
50b8697432 And one more last fix, i promise this is the last one for renaming dupes. 2019-05-04 15:30:16 -04:00
KillzXGaming
025703f33e Another fix 2019-05-04 15:28:38 -04:00
KillzXGaming
afdc56f0d4 Fix wring the string variable 2019-05-04 15:21:31 -04:00
KillzXGaming
e2e054f623 And another fix 2019-05-04 15:20:31 -04:00
KillzXGaming
686d6f809e Fix duplicate name check causing infinite loop 2019-05-04 15:15:44 -04:00
KillzXGaming
7668f9ad4c Update the channels properly when another image gets changed. 2019-05-04 14:32:45 -04:00
KillzXGaming
ae7dadf5b1 Few more fixes and use icon for alpha display 2019-05-04 14:22:21 -04:00
KillzXGaming
3af14bbc0f More image editor fixes 2019-05-04 14:06:36 -04:00
KillzXGaming
f4a43827a2 Cleanup some settings 2019-05-04 13:47:55 -04:00
KillzXGaming
6a7fe523e3 Load channel ocmponents for some formats 2019-05-04 13:38:18 -04:00
KillzXGaming
f351f30eb7 Disable by default until it's finished 2019-05-04 13:08:09 -04:00
KillzXGaming
9cb712cf12 Start to impliment component selectors for textures 2019-05-04 13:03:42 -04:00