gitweb.starshipfights.net Git

author	Lanius Trolling <lanius@laniustrolling.dev>
	Wed, 18 Dec 2024 02:41:27 +0000 (21:41 -0500)
committer	Lanius Trolling <lanius@laniustrolling.dev>
	Wed, 18 Dec 2024 02:41:27 +0000 (21:41 -0500)
commit	79ffd46a70ffedcfe81c6d405a382943c2defb72
tree	ec6b72707645a90b35819e0379a670f79078fc61	tree \| snapshot
parent	071f6ac7701e6f25b713facf64576f42494869a5	commit \| diff

Update dependencies, fix stuff, and move custom fonts to VFS

227 files changed:

.idea/artifacts/map_view_jvm.xml	[new file with mode: 0644]	blob
.idea/artifacts/map_view_map.xml	[new file with mode: 0644]	blob
.idea/gradle.xml		diff \| blob \| history
.idea/kotlinc.xml		diff \| blob \| history
build.gradle.kts		diff \| blob \| history
gradle/wrapper/gradle-wrapper.properties		diff \| blob \| history
map-view/build.gradle.kts	[new file with mode: 0644]	blob
map-view/src/mapMain/kotlin/info/mechyrdia/mapviewer/assets.kt	[new file with mode: 0644]	blob
map-view/src/mapMain/kotlin/info/mechyrdia/mapviewer/codec.kt	[new file with mode: 0644]	blob
map-view/src/mapMain/kotlin/info/mechyrdia/mapviewer/data.kt	[new file with mode: 0644]	blob
map-view/src/mapMain/kotlin/info/mechyrdia/mapviewer/entryPoint.kt	[new file with mode: 0644]	blob
map-view/src/mapMain/kotlin/info/mechyrdia/mapviewer/history.kt	[new file with mode: 0644]	blob
map-view/src/mapMain/kotlin/info/mechyrdia/mapviewer/math.kt	[new file with mode: 0644]	blob
map-view/src/mapMain/kotlin/info/mechyrdia/mapviewer/modal.kt	[new file with mode: 0644]	blob
map-view/src/mapMain/kotlin/info/mechyrdia/mapviewer/render.kt	[new file with mode: 0644]	blob
map-view/src/mapMain/kotlin/info/mechyrdia/mapviewer/search.kt	[new file with mode: 0644]	blob
map-view/src/mapMain/kotlin/info/mechyrdia/mapviewer/utils.kt	[new file with mode: 0644]	blob
settings.gradle.kts		diff \| blob \| history
src/jvmMain/kotlin/info/mechyrdia/BlockingCode.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/Configuration.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/Factbooks.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/JSON.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/Utils.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/auth/SessionStorage.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/auth/Sessions.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/auth/ViewsLogin.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/auth/WebDav.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/auth/nationstates.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/data/Bson.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/data/Comments.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/data/Data.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/data/DataFiles.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/data/MigrateFiles.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/data/MigrateFilesSerial.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/data/Nations.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/data/ViewComments.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/data/ViewsComment.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/data/ViewsFiles.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/data/ViewsUser.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/data/Visits.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/data/Xml.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/April1st.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ArticleListing.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ArticleTitles.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/AssetCaching.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/AssetCompression.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/AssetHashing.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/FileData.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/Fonts.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/HttpUtils.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ParserBuilder.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ParserHtml.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ParserLexer.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ParserLexerAsync.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ParserPlain.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ParserPreprocess.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ParserPreprocessInclude.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ParserPreprocessJson.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ParserPreprocessMath.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ParserRaw.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ParserRobot.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ParserTree.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ParserUtils.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ViewBar.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ViewMap.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ViewNav.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ViewOg.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ViewTpl.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ViewsError.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ViewsLore.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ViewsPrefs.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ViewsQuote.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ViewsRobots.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/lore/ViewsRss.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/robot/RobotApi.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/robot/RobotCodec.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/robot/RobotFiles.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/robot/RobotRateLimiter.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/robot/RobotSchema.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/robot/RobotService.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/robot/RobotSse.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/robot/RobotUserLimiter.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/robot/ViewsRobot.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/route/ResourceBodies.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/route/ResourceCsrf.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/route/ResourceHandler.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/route/ResourceMultipart.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/route/ResourceTypes.kt	[deleted file]	blob \| history
src/jvmMain/kotlin/info/mechyrdia/route/ResourceWebDav.kt	[deleted file]	blob \| history
src/jvmMain/resources/logback.xml	[deleted file]	blob \| history
src/jvmMain/resources/static/admin.css	[deleted file]	blob \| history
src/jvmMain/resources/static/admin.js	[deleted file]	blob \| history
src/jvmMain/resources/static/font/DejaVuSans-Bold.woff	[deleted file]	blob \| history
src/jvmMain/resources/static/font/DejaVuSans-BoldOblique.woff	[deleted file]	blob \| history
src/jvmMain/resources/static/font/DejaVuSans-Oblique.woff	[deleted file]	blob \| history
src/jvmMain/resources/static/font/DejaVuSans.woff	[deleted file]	blob \| history
src/jvmMain/resources/static/font/JetBrainsMono-ExtraBold.woff	[deleted file]	blob \| history
src/jvmMain/resources/static/font/JetBrainsMono-ExtraBoldItalic.woff	[deleted file]	blob \| history
src/jvmMain/resources/static/font/JetBrainsMono-Medium.woff	[deleted file]	blob \| history
src/jvmMain/resources/static/font/JetBrainsMono-MediumItalic.woff	[deleted file]	blob \| history
src/jvmMain/resources/static/font/Oxanium-Bold.woff	[deleted file]	blob \| history
src/jvmMain/resources/static/font/Oxanium-ExtraBold.woff	[deleted file]	blob \| history
src/jvmMain/resources/static/font/Oxanium-Regular.woff	[deleted file]	blob \| history
src/jvmMain/resources/static/font/Oxanium-SemiBold.woff	[deleted file]	blob \| history
src/jvmMain/resources/static/font/kishari-language-alphabet.woff	[deleted file]	blob \| history
src/jvmMain/resources/static/font/pokhval-language-alphabet.woff	[deleted file]	blob \| history
src/jvmMain/resources/static/font/thedish-language-alphabet.woff	[deleted file]	blob \| history
src/jvmMain/resources/static/font/tylan-language-alphabet-3.woff	[deleted file]	blob \| history
src/jvmMain/resources/static/images/external-link-dark.png	[deleted file]	blob \| history
src/jvmMain/resources/static/images/external-link.png	[deleted file]	blob \| history
src/jvmMain/resources/static/images/icon.png	[deleted file]	blob \| history
src/jvmMain/resources/static/images/icon.svg	[deleted file]	blob \| history
src/jvmMain/resources/static/init.js	[deleted file]	blob \| history
src/jvmMain/resources/static/obj-viewer/hammer.min.js	[deleted file]	blob \| history
src/jvmMain/resources/static/obj-viewer/three-examples.js	[deleted file]	blob \| history
src/jvmMain/resources/static/obj-viewer/three.js	[deleted file]	blob \| history
src/jvmMain/resources/static/raw.css	[deleted file]	blob \| history
src/jvmMain/resources/static/style.css	[deleted file]	blob \| history
src/main/kotlin/info/mechyrdia/BlockingCode.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/Configuration.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/Factbooks.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/JSON.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/Utils.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/auth/NationStates.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/auth/SessionStorage.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/auth/Sessions.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/auth/ViewsLogin.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/auth/WebDav.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/data/Bson.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/data/Comments.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/data/Data.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/data/DataFiles.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/data/MigrateFiles.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/data/MigrateFilesSerial.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/data/Nations.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/data/ViewComments.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/data/ViewsComment.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/data/ViewsFiles.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/data/ViewsUser.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/data/Visits.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/data/Xml.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/April1st.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ArticleListing.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ArticleTitles.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/AssetCaching.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/AssetCompression.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/AssetHashing.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/FileData.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/FontAssets.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/FontDrawing.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/HttpUtils.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ParserBuilder.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ParserHtml.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ParserLexer.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ParserLexerAsync.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ParserPlain.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ParserPreprocess.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ParserPreprocessInclude.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ParserPreprocessJson.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ParserPreprocessMath.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ParserRaw.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ParserRobot.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ParserTree.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ParserUtils.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ViewBar.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ViewMap.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ViewNav.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ViewOg.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ViewTpl.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ViewsError.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ViewsLore.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ViewsPrefs.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ViewsQuote.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ViewsRobots.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/lore/ViewsRss.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/robot/RobotApi.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/robot/RobotCodec.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/robot/RobotFiles.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/robot/RobotRateLimiter.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/robot/RobotSchema.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/robot/RobotService.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/robot/RobotSse.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/robot/RobotUserLimiter.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/robot/ViewsRobot.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/route/ResourceBodies.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/route/ResourceCsrf.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/route/ResourceHandler.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/route/ResourceMultipart.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/route/ResourceTypes.kt	[new file with mode: 0644]	blob
src/main/kotlin/info/mechyrdia/route/ResourceWebDav.kt	[new file with mode: 0644]	blob
src/main/resources/logback.xml	[new file with mode: 0644]	blob
src/main/resources/static/admin.css	[new file with mode: 0644]	blob
src/main/resources/static/admin.js	[new file with mode: 0644]	blob
src/main/resources/static/font/DejaVuSans-Bold.woff	[new file with mode: 0644]	blob
src/main/resources/static/font/DejaVuSans-BoldOblique.woff	[new file with mode: 0644]	blob
src/main/resources/static/font/DejaVuSans-Oblique.woff	[new file with mode: 0644]	blob
src/main/resources/static/font/DejaVuSans.woff	[new file with mode: 0644]	blob
src/main/resources/static/font/JetBrainsMono-ExtraBold.woff	[new file with mode: 0644]	blob
src/main/resources/static/font/JetBrainsMono-ExtraBoldItalic.woff	[new file with mode: 0644]	blob
src/main/resources/static/font/JetBrainsMono-Medium.woff	[new file with mode: 0644]	blob
src/main/resources/static/font/JetBrainsMono-MediumItalic.woff	[new file with mode: 0644]	blob
src/main/resources/static/font/Oxanium-Bold.woff	[new file with mode: 0644]	blob
src/main/resources/static/font/Oxanium-ExtraBold.woff	[new file with mode: 0644]	blob
src/main/resources/static/font/Oxanium-Regular.woff	[new file with mode: 0644]	blob
src/main/resources/static/font/Oxanium-SemiBold.woff	[new file with mode: 0644]	blob
src/main/resources/static/images/external-link-dark.png	[new file with mode: 0644]	blob
src/main/resources/static/images/external-link.png	[new file with mode: 0644]	blob
src/main/resources/static/images/icon.png	[new file with mode: 0644]	blob
src/main/resources/static/images/icon.svg	[new file with mode: 0644]	blob
src/main/resources/static/init.js	[new file with mode: 0644]	blob
src/main/resources/static/obj-viewer/hammer.min.js	[new file with mode: 0644]	blob
src/main/resources/static/obj-viewer/three-examples.js	[new file with mode: 0644]	blob
src/main/resources/static/obj-viewer/three.js	[new file with mode: 0644]	blob
src/main/resources/static/raw.css	[new file with mode: 0644]	blob
src/main/resources/static/style.css	[new file with mode: 0644]	blob
src/mapMain/kotlin/info/mechyrdia/mapviewer/assets.kt	[deleted file]	blob \| history
src/mapMain/kotlin/info/mechyrdia/mapviewer/codec.kt	[deleted file]	blob \| history
src/mapMain/kotlin/info/mechyrdia/mapviewer/data.kt	[deleted file]	blob \| history
src/mapMain/kotlin/info/mechyrdia/mapviewer/entryPoint.kt	[deleted file]	blob \| history
src/mapMain/kotlin/info/mechyrdia/mapviewer/history.kt	[deleted file]	blob \| history
src/mapMain/kotlin/info/mechyrdia/mapviewer/math.kt	[deleted file]	blob \| history
src/mapMain/kotlin/info/mechyrdia/mapviewer/modal.kt	[deleted file]	blob \| history
src/mapMain/kotlin/info/mechyrdia/mapviewer/render.kt	[deleted file]	blob \| history
src/mapMain/kotlin/info/mechyrdia/mapviewer/search.kt	[deleted file]	blob \| history
src/mapMain/kotlin/info/mechyrdia/mapviewer/utils.kt	[deleted file]	blob \| history
stuff/mintah_table.txt	[new file with mode: 0644]	blob
stuff/mintah_table_script.py	[new file with mode: 0644]	blob

The source code for the factbook-hosting web application at https://mechyrdia.info/

RSS Atom