ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,246 Commits 3 Branches 7 Tags 87 MiB
Commit Graph

1566 Commits

Author SHA1 Message Date
zilmar 2ed2205db2 Reload Enhancements on edit dialog 2021-03-23 12:41:18 +10:30
zilmar 133170c1a2 Add option to not exit fullscreen on lose focus 2021-03-23 11:46:11 +10:30
Derek "Turtle" Roe b78451cf4d Update Debugger-MemorySearch.cpp 
Fix capitalization, fix some TODO comments, fix spacing, adjust some wording, remove some comments
 2021-03-17 22:58:17 -05:00
Derek "Turtle" Roe 38e3b5c75d Update ScriptInstance.cpp 
Fix capitalization, adjust some TODO comments, add punctuation, adjust wording, remove extra comments, add newlines
 2021-03-17 22:58:17 -05:00
Derek "Turtle" Roe 40837a4535 Update OpInfo.h 
Fix capitalization, add newline
 2021-03-17 22:58:17 -05:00
Derek "Turtle" Roe acda5a8778 Update MemoryScanner.h 
Fix capitalization, add hyphen for 64-bit
 2021-03-17 22:58:17 -05:00
Derek "Turtle" Roe bc6de64ae4 Update MemoryScanner.cpp 
Fix capitalization, remove a comment
 2021-03-17 22:58:17 -05:00
Derek "Turtle" Roe 39dc60e1a5 Update DebugMMU.cpp 
Fix capitalization, fix abbreviations
 2021-03-17 22:58:17 -05:00
Derek "Turtle" Roe b7d1c1d379 Update Debugger.cpp 
Fix capitalization, Fix TODO comment
 2021-03-17 22:58:17 -05:00
Derek "Turtle" Roe d9dbd77533 Update Debugger-ViewMemory.cpp 
Fix capitalization, add and fix some TODO comments
 2021-03-17 22:58:17 -05:00
Derek "Turtle" Roe 85f8eb31a6 Update Debugger-RegisterTabs.cpp 
Fix capitalization, add newline
 2021-03-17 22:58:17 -05:00
Derek "Turtle" Roe 5bf2a3bfb6 Update Debugger-Commands.cpp 
Fix capitalization, adjust some wording, add TODO comments, add punctuation, add newline
 2021-03-17 22:58:17 -05:00
Derek "Turtle" Roe 848f6bfdcf Update ScriptInstance.h 
Fix capitalization, add some TODO comments, add newline
 2021-03-17 22:58:17 -05:00
Derek "Turtle" Roe 3c23dd77e2 Update Assembler.cpp 
Fix capitalization, and change some wording
 2021-03-17 22:58:17 -05:00
Derek "Turtle" Roe 8ba0e0a427 Update Debugger-Symbols.cpp 
Fix capitalization, fix TODO comment
 2021-03-17 22:58:17 -05:00
Derek "Turtle" Roe 949f99c415 Update Debugger-DMALogView.cpp 
Fix capitalization, add a line, add newline
 2021-03-17 22:58:17 -05:00
Derek "Turtle" Roe 743158c37b Update Symbols.h 
Add newline
 2021-03-17 22:58:17 -05:00
Derek "Turtle" Roe f802892277 Update ScriptSystem.h 
Fix capitalization and add newline
 2021-03-17 22:58:17 -05:00
Derek "Turtle" Roe e64c00b49e Update ScriptSystem.cpp 
Fix capitalization
 2021-03-17 22:58:17 -05:00
Derek "Turtle" Roe ae24c9e1e4 Update ScriptHook.h 
Change multiline comments into single line comments
 2021-03-17 22:58:17 -05:00
Derek "Turtle" Roe e6b9802a60 Update ScriptHook.cpp 
Add newline
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe 314efb2da6 Update DMALog.h 
Add newline
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe de2b88ca7e Update DMALog.cpp 
Add newline
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe 3e9ea5be8c Update DebuggerUI.h 
Add newline
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe 9ec67ea6f5 Update Debugger-ViewMemory.h 
Remove extra line
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe 409ca3b520 Update Debugger-Symbols.h 
Fix TODO comment
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe b7799663ca Update Debugger-StackView.h 
Add newline
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe c0a539c802 Update Debugger-StackView.cpp 
Add newline
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe 0879ff0d35 Update Debugger-StackTrace.h 
Add newline
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe f52cf3a8b1 Update Debugger-StackTrace.cpp 
Fix title case and add newline
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe 5682b9d5b7 Update Debugger-Scripts.cpp 
Fix title case and capitalization
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe 1755dedff6 Update Debugger-RegisterTabs.h 
Fix capitalization, add newline
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe b29be48a88 Update Debugger-RegisterTabData.h 
Add newline
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe 58802684b1 Update Debugger-MemorySearch.h 
Remove unnecessary comments, fix title case and abbreviations, fix wording
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe e92a29493e Update Debugger-MemoryDump.cpp 
Fix title case, add newline
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe c0bd0dba2e Update Debugger-ExceptionBreakpoints.cpp 
Add newline
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe 7a439e5f7e Update Debugger-CPULogView.cpp 
Change wording
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe 33fed55835 Update Debugger-AddSymbol.cpp 
Add newline
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe f8efc67258 Update Debugger-AddBreakpoint.h 
Add newline
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe 5f2dc84981 Update Debugger-AddBreakpoint.cpp 
Add newline
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe fba5dda943 Update DebugDialog.h 
Add newline
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe 23df501cc8 Update CPULog.cpp 
Add newline
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe c4ac46b501 Update Breakpoints.h 
Add newline
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe 45d4e9fc4e Update Assembler.h 
Fix title case
 2021-03-17 22:58:16 -05:00
Derek "Turtle" Roe 5d2d412c45 Update SettingsPage-Plugin.cpp 
Fix spacing, title case, capitalization, and add newline
 2021-03-17 21:12:07 -05:00
Derek "Turtle" Roe bb6c21918c Update SettingsPage-Options.cpp 
Fix spacing, title case, and capitalization
 2021-03-17 21:11:54 -05:00
Derek "Turtle" Roe 15fb604d64 Update SettingsPage-KeyboardShortcuts.cpp 
Fix spacing, title case, capitalization, and add newline
 2021-03-17 21:11:49 -05:00
Derek "Turtle" Roe daa5c3589b Update SettingsPage-GameBrowser.cpp 
Fix spacing, title case, capitalization, and add newline
 2021-03-17 21:11:33 -05:00
Derek "Turtle" Roe a20316cf2b Update SettingsPage-Game-Status.cpp 
Change Rom to ROM, add newline
 2021-03-17 21:11:18 -05:00
Derek "Turtle" Roe 9a56d4ca9b Update SettingsPage-Game-Recompiler.cpp 
Fix spacing, title case, capitalization, and add newline
 2021-03-17 21:10:57 -05:00
Derek "Turtle" Roe ebeddb8d47 Update SettingsPage-Game-Plugin.cpp 
Fix spacing, title case, capitalization, and add newline
 2021-03-17 21:10:28 -05:00
Derek "Turtle" Roe 861cea4b4c Update SettingsPage-Game-General.cpp 
Fix spacing, title case, and capitalization
 2021-03-17 21:09:15 -05:00
Derek "Turtle" Roe 114757b1fb Update SettingsPage-Game-DiskDrive.cpp 
Fix spacing, title case, and capitalization
 2021-03-17 21:08:54 -05:00
Derek "Turtle" Roe 334058af9b Update SettingsPage-DiskDrive.cpp 
Fix spacing, title case, capitalization, and add newline
 2021-03-17 21:08:09 -05:00
Derek "Turtle" Roe e210a00430 Update SettingsPage-Directories.cpp 
Fix spacing, title case, capitalization, and add newline
 2021-03-17 21:07:32 -05:00
Derek "Turtle" Roe c210973521 Update SettingsPage-Defaults.cpp 
Add newline
 2021-03-17 21:07:11 -05:00
Derek "Turtle" Roe adafb8b8ac Update SettingsPage-AdvancedOptions.cpp 
Fix spacing, title case, and capitalization
 2021-03-17 21:07:05 -05:00
Derek "Turtle" Roe 9ec34d4c39 Update HexEditCtrl.cpp 
Fix title case, adjust spacing, fix comments
 2021-03-17 20:47:05 -05:00
Derek "Turtle" Roe 3a18ee46de Update ListCtrl.h 
Fix lines, fix title case, fix typos, fix abbreviations
 2021-03-17 20:47:05 -05:00
Derek "Turtle" Roe 8251abf36d Update ListCombo.h 
Remove a line, fix title case
 2021-03-17 20:47:05 -05:00
Derek "Turtle" Roe 53d936ec05 Update DragDrop.h 
Remove a line, fix title case
 2021-03-17 20:47:05 -05:00
Derek "Turtle" Roe 82059adc6f Update ListDate.h 
Remove a line, fix title case, adjust spacing
 2021-03-17 20:47:05 -05:00
Derek "Turtle" Roe 2d427d3a3b Update ListEdit.h 
Fix title case and punctuation, remove one line at the top
 2021-03-17 20:47:05 -05:00
Derek "Turtle" Roe 4052011e09 Update TitleTip.h 
Fix title case, adjust spacing, remove some punctuation
 2021-03-17 20:47:05 -05:00
Derek "Turtle" Roe c8faa1d46d Update wtl-BitmapPicture.h 
Add newline
 2021-03-17 20:47:05 -05:00
Derek "Turtle" Roe eba0bc30a2 Update TooltipDialog.h 
Remove a line, remove some spacing
 2021-03-17 20:47:05 -05:00
Derek "Turtle" Roe be699d3986 Update PartialGroupBox.cpp 
Remove punctuation, fix title case
 2021-03-17 20:47:05 -05:00
Derek "Turtle" Roe c417a1e439 Update ModifiedEditBox.h 
Remove a line
 2021-03-17 20:47:05 -05:00
Derek "Turtle" Roe 77f1bde845 Update ModifiedEditBox.cpp 
Add newline
 2021-03-17 20:47:05 -05:00
Derek "Turtle" Roe 215859c96e Update ModifiedComboBox.h 
Remove a line
 2021-03-17 20:47:05 -05:00
Derek "Turtle" Roe eb03ed4b7e Update GetCWindowText.h 
Remove a line
 2021-03-17 20:47:05 -05:00
Derek "Turtle" Roe 7e922500b6 Update GetCWindowText.cpp 
Add newline
 2021-03-17 20:47:05 -05:00
Derek "Turtle" Roe 8859fab473 Update EditNumber32.cpp 
Fix title case and adjust some spacing, add newline
 2021-03-17 20:47:05 -05:00
Derek "Turtle" Roe 1049ffe489 Update ListTypes.h 
Remove a line
 2021-03-17 20:47:05 -05:00
Derek "Turtle" Roe 3f9431d609 Update DataArray.h 
Fix title case and add a line
 2021-03-17 20:47:05 -05:00
Derek "Turtle" Roe ba9dae4221 Update SettingsConfig.cpp 
Capitalize some abbreviations, remove title case
 2021-03-17 20:45:25 -05:00
Derek "Turtle" Roe a95d48d0d1 Update RomBrowserClass.cpp 
Fix title case, add some spacing, rom > ROM, fix some typos, remove some punctuation, capitalize abbreviated code, adjust some wording
 2021-03-17 20:45:25 -05:00
Derek "Turtle" Roe 911c85b162 Update MainMenu.cpp 
Fix title case, add spacing, remove some punctuation, rom > ROM, convert multi line comments into single line comments, add newline
 2021-03-17 20:45:25 -05:00
Derek "Turtle" Roe c01745c3ab Update MainWindow.cpp 
Fix title case, add spacing, rom > ROM, add newline, and fix some instances of "Rom" being used in the GUI
 2021-03-17 20:45:25 -05:00
Derek "Turtle" Roe 16ebbd9025 Update MainMenu.h 
Fix title case and adjust spacing
 2021-03-17 20:45:25 -05:00
Derek "Turtle" Roe 7d8316b0da Update DiscordRPC.cpp 
Fix title case, add spacing, add newline, rom > ROM
 2021-03-17 20:45:25 -05:00
Derek "Turtle" Roe 2f82144606 Update WelcomeScreen.h 
Add newline
 2021-03-17 20:45:25 -05:00
Derek "Turtle" Roe 8a83438d8a Update WelcomeScreen.cpp 
Remove punctuation and capitalize abbreviation/code
 2021-03-17 20:45:25 -05:00
Derek "Turtle" Roe 2b825d2311 Update SupportWindow.h 
Add newline
 2021-03-17 20:45:25 -05:00
Derek "Turtle" Roe cb7da8df46 Update SupportWindow.cpp 
Add newline
 2021-03-17 20:45:25 -05:00
Derek "Turtle" Roe b7a4153466 Update SupportEnterCode.h 
Add newline
 2021-03-17 20:45:25 -05:00
Derek "Turtle" Roe 753c54bf35 Update RomInformationClass.cpp 
Fix capitalization and add space
 2021-03-17 20:45:25 -05:00
Derek "Turtle" Roe 5c1a284dce Update RomBrowser.h 
Add spacing, fix title case
 2021-03-17 20:45:25 -05:00
Derek "Turtle" Roe dcab59c3d8 Update ProjectSupport.h 
Add newline
 2021-03-17 20:45:25 -05:00
Derek "Turtle" Roe 80d97c3ca7 Update ProjectSupport.cpp 
Add newline
 2021-03-17 20:45:25 -05:00
Derek "Turtle" Roe d2494a7728 Update Notification.h 
Fix title case, rom > ROM, and capitalize where appropriate
 2021-03-17 20:45:25 -05:00
Derek "Turtle" Roe 4199b3b4e5 Update Notification.cpp 
Add spacing, fix title case, change rom to ROM, adjust wording, and add newline
 2021-03-17 20:45:25 -05:00
Derek "Turtle" Roe bfe77e3416 Update MenuShortCuts.cpp 
Add spacing, fix title case, adjust grammar, add newline
 2021-03-17 20:45:25 -05:00
Derek "Turtle" Roe 39e3253d57 Update MenuClass.h 
Add a space and add capitalization
 2021-03-17 20:45:24 -05:00
Derek "Turtle" Roe 432e91b697 Update MenuClass.cpp 
Add newline
 2021-03-17 20:45:24 -05:00
Derek "Turtle" Roe a1b5cdd58c Update MainWindow.h 
Add spacing, add capitalization where appropriate
 2021-03-17 20:45:24 -05:00
Derek "Turtle" Roe c6b914aee2 Update LoggingUI.cpp 
Add newline
 2021-03-17 20:45:24 -05:00
Derek "Turtle" Roe e65b5533cd Update EnhancementUI.cpp 
Add newline
 2021-03-17 20:45:24 -05:00
Derek "Turtle" Roe 04d23cf107 Update DiscordRPC.h 
Add newline
 2021-03-17 20:45:24 -05:00
Derek "Turtle" Roe 7f1e4e6aa1 Update CheatClassUI.h 
Add newline
 2021-03-17 20:45:24 -05:00
Derek "Turtle" Roe 84ecfb0c01 Update CheatClassUI.cpp 
Adjust spacing, fix title case, and capitalize some comments
 2021-03-17 20:45:24 -05:00
Derek "Turtle" Roe a8bcc414f9 Update API.js 
Remove some spaces, fix title case, and update capitalization
 2021-03-17 20:45:24 -05:00
Derek "Turtle" Roe 55d5ba7bc8 Update About.h 
Add newline
 2021-03-17 20:45:24 -05:00
Derek "Turtle" Roe df871637ee Update About.cpp 
Add a hyphen in high-definition, lower case the t in thanks, and add a newline
 2021-03-17 20:45:24 -05:00
zilmar 1249e1f9f0 Add ability to remove the status bar 2021-03-18 11:02:37 +10:30
Derek "Turtle" Roe 0a7f421c0c Add final new lines to 2 files and beautify 2 files in the settings directory 2021-03-10 03:37:35 -06:00
zilmar 93b35cdf28 Add Overclock to enhancment 2021-03-10 18:09:01 +10:30
zilmar 0f605a06d3 Remove Notes from being displayed by default 2021-03-08 18:24:49 +10:30
zilmar a29cdd75dd
Merge pull request #1999 from vgturtle127/master 
Code and comment beautification (starting with main.cpp)
 2021-03-06 10:58:06 +10:30
zilmar 5cf6a7729f
Merge pull request #2000 from flagrama/fix-settings-close-x 
Settings: Fix titlebar Close button
 2021-03-06 10:57:47 +10:30
zilmar b35d59408a Add diable gameshark code 2021-03-06 10:56:24 +10:30
zilmar bc81e041f8 Have Cheat UI validate via CEnhancement 2021-03-04 14:29:31 +10:30
Vincent Cunningham 971f19745b Settings: Fix titlebar Close button 
IDCANCEL is still sent by the native Close button in the titlebar and
should still be handled.
 2021-03-03 11:32:20 -05:00
Derek "Turtle" Roe 65fb1e472b Update main.cpp 2021-03-03 01:22:41 -06:00
Derek "Turtle" Roe 796a2ade62 Comment cleanup of main.cpp 
Eliminate title case in some instances, improve some wording, and add a space after the single line comment block to improve readability
 2021-03-03 01:12:05 -06:00
Vincent Cunningham 8ece98efc4 Fix WelcomeScreen setting Default_GFX_Plugin 
Settings.cpp - Was missing a value for the new SettingID while running a
Debug build causing breakpoint to be handled when clicking OK. A new
handler with a default value has been added.

WelcomeScreen.cpp - Would set the Default_GFX_Plugin value and the value
would be used when launching a game or viewing the Plugins menu in
Options and set the Current_GFX_Plugin, but if a user were to try to
configure their Graphics Plugin prior to launching a game, they would
always open the Project64 Video config screen, even if they had chosen
GLideN64 as the default plugin. The Current_GFX_Plugin is now set with
the value of the Default_GFX_Plugin to ensure the correct configuration
dialog is opened.

WelcomeScreen.cpp - String value would always load the non-debug version
of Project64 Video after the above changes. The string to use is now
loaded from the Default_GFX_Plugin so if the default has never been set
the proper default value should now be used. If it has been set before
and is not a Project64 Video plugin, the value will be set to Project64
Video (non-debug) to keep the dialog accurate.
 2021-03-02 17:32:05 -05:00
zilmar 605dbafd15 Resume after closing enhancement window 2021-03-02 17:15:24 +10:30
zilmar 5c60ea213f Update copyright date 2021-03-02 12:43:17 +10:30
zilmar 91afa79c6c
Merge pull request #1994 from vgturtle127/master 
Update N64System.h copyright header and comments
 2021-03-01 20:12:51 +10:30
zilmar b8206c5043
Merge pull request #1995 from flagrama/linux-fixes 
Linux fixes
 2021-03-01 20:10:49 +10:30
zilmar 88144f53c9 Prompt for jabo or glide plugin 2021-03-01 20:08:29 +10:30
Derek "Turtle" Roe 0e0c28c493 Update N64System.h 2021-02-28 22:05:04 -06:00
Vincent Cunningham dcb360cf41
Replace \ with / in include directives 2021-02-28 17:38:56 -05:00
Derek "Turtle" Roe f36fdb6098 Update N64System.h comments 
Fix title case and make MIPS an acronym. Add spaces before comments to increase readability on certain themes and editors.
 2021-02-28 04:40:18 -06:00
Derek "Turtle" Roe 03dce5f74e Update copyright header for N64System.h 
Switched from block comments to single line comments, updated copyright year, reduced verbosity of license lines, and switched to HTTPS for license link.
 2021-02-28 04:28:15 -06:00
zilmar 9262e37c47 Make sure file is reloaded on opening cheat config 2021-02-24 21:25:35 +10:30
zilmar 998ff9ea2a Enhancements: show notes 2021-02-23 20:16:00 +10:30
zilmar 20564b29bc cheats: Update the add text on new cheat 2021-02-23 20:14:36 +10:30
zilmar d2b586f9df enable apply button when enabling/disabling enhancements 2021-02-23 15:08:01 +10:30
zilmar c1ed471fc1
Merge pull request #1910 from flagrama/fix-manual-start-emulation 
Fix Start Emulation by only skipping StartEmulation when AutoStart is disabled
 2021-02-20 15:15:51 +10:30
zilmar 6127878f8f Add plugin limiting to enhancements 2021-02-17 10:24:17 +10:30
zilmar 3e02ff31d7 Add Plugin list to enhancment 2021-02-11 21:56:09 +10:30
Vincent Cunningham 678c5819e8
Only skip StartEmulation in RunLoadedImage when AutoStart disabled 2021-02-02 10:27:23 -05:00
zilmar 3553c87121 Move enable enhancement to advanced 2021-02-02 17:01:29 +10:30
Vincent Cunningham 3482a1a1cf
Call RunLoadedImage when manually starting emulation 
RunLoadedImage is skipped in the Run*Image methods in CN64System if AutoStart is disabled. If the check for if there is a current g_BaseSystem fails, these changes run RunLoadedImage to create one and StartEmulation.

I'm not sure the extra NULL guard is necessary, but I don't want to skip the first g_BaseSystem check altogether. I added it as a "just in case."
 2021-02-01 23:42:54 -05:00
zilmar 89d56ff4fa Fix modal error in EnhancementUI 2021-02-02 13:55:28 +10:30
zilmar a4f904e4d7 Merge branch 'master' of https://github.com/project64/project64 
# Conflicts:
#	Source/Project64/UserInterface/UIResources.rc
 2021-02-02 13:40:12 +10:30
zilmar 782e781bab Be able to edit/enable/disable enhancements while running 2021-02-02 13:22:47 +10:30
LuigiBlood 6f05e7a2f2 [Settings] Add Disk Seek Timing choice 2021-01-29 23:37:27 +01:00
zilmar b6325104a5 Fix validation when name is empty 2021-01-20 21:27:47 +10:30
zilmar cd16a8cc48 Clean up some warnings 2021-01-19 16:28:59 +10:30
zilmar d1223d1cf0 Fix build error 2021-01-17 17:29:05 +10:30
zilmar 453efb6d5e
Merge pull request #1897 from Squall-Leonhart/master 
Replace Manufacturer with Media and what each letter corresponds with.
 2021-01-17 16:17:01 +10:30
zilmar ddcd6ef855 Confirm cheat changes on closing window 2021-01-17 16:15:26 +10:30
zilmar fd1a6112c0 Clean up enhancements code 2021-01-17 13:47:58 +10:30
Squall Leonhart 1c21979afb Update RomInformationClass.cpp 
lets just update these id's for now then
 2021-01-11 12:27:37 +11:00
Squall Leonhart 636d39b291 Revert "Update RomInformationClass.cpp" 
This reverts commit 6771249eca.
 2021-01-11 12:26:57 +11:00
Squall Leonhart 6771249eca Update RomInformationClass.cpp 
i don't know if this will even work?
 2021-01-11 12:19:40 +11:00
Squall Leonhart 7d882f75b6 Manufacter ID was Media type all along 
change all relevant code accordingly
 2021-01-11 11:58:44 +11:00
Squall Leonhart cbecaf0c05 Handles cases where the Manufacturer ID is 43 instead of 4E 
So these games are no longer listed as Uknown in their manufacturer field.
 2021-01-09 11:07:21 +11:00