Factorio / calculator-ui

Commit d7393909abb88e2bb8e5d06a83ee5fee21827465

Authored by Stefan Wichmann
1 parent 41e03c9a

preparing release of version 0.18.6

Inline Side-by-side
Showing 15 changed files with 261 additions and 168 deletions
README.md
  View file @d739390
... ... @@ -22,7 +22,7 @@ Well ... ehm ... search for the mod ingame and install it :-)
22 22 Press the 3 little dots on the shortcuts UI of Factorio to select the "Calculator". Afterwards you can click on the calculator symbol to open it.
23 23  
24 24 ## Changelog
25   -see separate [changelog](CHANGELOG.md)
  25 +see separate [changelog](changelog.txt)
26 26  
27 27 ## License
28 28 [MIT](https://choosealicense.com/licenses/mit/)
29 29 \ No newline at end of file
... ...
calculator.lua
  View file @d739390
... ... @@ -5,8 +5,8 @@ local function get_gui_root(player)
5 5 return player.gui.screen
6 6 end
7 7  
8   -local nilaus_think = { "calcui_nilaus_really", "calcui_nilaus_ugghhhh" }
9   -local nilaus_rant = { "calcui_nilaus_fuck1", "calcui_nilaus_fuck2", "calcui_nilaus_fuck3" }
  8 +local nilaus_think = { "calcui_nilaus_really" }
  9 +local nilaus_rant = { "calcui_nilaus_ugghhhh", "utility/cannot_build" }
10 10  
11 11 -- ----------------------------------------------------------------
12 12 local function play_sfx(player, sfx)
... ... @@ -387,6 +387,19 @@ local function fix_equation(equation, root)
387 387 end
388 388  
389 389 -- fix percentage
  390 + -- complex equations like "20+10%" = 22, before it was 20.1 -- big thanks to GWulf
  391 + result = result:gsub("(%d+)(.)(%d+)%%", function (base, sign, perc)
  392 + if sign == "+" then
  393 + return base .. "*1." .. perc
  394 + elseif sign == "-" then
  395 + return base .. "*(1-0." ..perc .. ")"
  396 + elseif sign == "*" then
  397 + return "(" .. base .. "/100)*" .. perc
  398 + elseif sign == "/" then
  399 + return "(" .. base .. "*100)/" .. perc
  400 + end
  401 + end)
  402 + -- still the simple equation needs some work: 1% = 0.01
390 403 result = result:gsub("(%%)", "/100")
391 404  
392 405 -- fix danish keyboard
... ...
CHANGELOG.md renamed to changelog.txt
  View file @d739390
1   -# Changelog
2   -All notable changes to this project will be documented in this file.
3   -
4   -The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
5   -and this project adheres to the versioning of Factorio, so 0.18.x will be at least compatible / tested with Factorio 0.18.x.
6   -
7   -## [Released]
8   -
9   -## [0.18.5] - 2020-06-08
10   -Added some fancy sound effects and a special [Nilaus](https://www.youtube.com/c/Nilaus) mode.
11   -
12   -### Added
13   -- Added sound effects to the calculator whenever a result may be not the desired one (has be enabled in the settings)
14   -
15   -### Changed
16   -- Emotes will no longer be displayed at default, "Nilaus mode" has to be enabled for the emotes to appear again
17   -
18   -### Fixed
19   -- Recent results weren't properly cleared in 0.18.4
20   -
21   -### Misc
22   -- Some code rework, not too fancy stuff
23   -
24   -## [0.18.4] - 2020-06-07
25   -### General
26   -Based on user feedback updated the mod
27   -
28   -### Added
29   -- Added the possibility to copy the results (from recent and also the current) to the display
30   -
31   -### Changed
32   -- Window now remember last location when opened
33   -- Updated the BS button (it's backspace people...) so it now has a nice icon instead of the letters
34   -- Recent results now add to the top, instead of the bottom
35   -- When calculator is opened it focues on the display for entering the equation
36   -- You can click pretty much anywhere now and it focues on the display for entering the equation
37   -
38   -### Fixed
39   -- On multiplayer session the window would lag behind while dragging, because the location would be saved on server. This isn't going to happen anymore, hopefully (not tested yet).
40   -- When window is moved out of boundaries, when reopened, it will correct itself to be fully in sight again.
41   -- Settings had weird default values (were set 2 times)
42   -
43   -## [0.18.3] - 2020-06-07
44   -### General
45   -A small visual overhaul of the mod
46   -### Added
47   -- Added the possibility to "calculate further" (especially usefull when setting "Clear equation on calculation" is set). When the equation doesn't start with a number, character or parenthesis (so it assumes it starts with a math symbol) it will take the previous result and prepend it to the current equation.
48   -
49   -### Changed
50   -- Updated the UI a bit to match it in color a bit more to the Windows calculator
51   -- Updated also the icon on the shortcut to better distinguish it
52   -
53   -## [0.18.2] - 2020-06-06
54   -### General
55   -Based on user feedback updated the mod
56   -
57   -### Added
58   -- new easter egg :-)
59   -- added more math.lib functions
60   - - atan2() -> math.atan2()
61   - - cosh() -> math.cosh()
62   - - sinh() -> math.sinh()
63   - - tanh() -> math.tanh()
64   - - log10() -> math.log10()
65   - - fmod() -> math.fmod()
66   - - frexp() -> math.frexp()
67   - - ldexp() -> math.ldexp()
68   - - pow() -> math.pow()
69   -
70   -### Fixed
71   -- Interpreting ";" as "," in the equation, because of the fix in 0.18.1, so that math functions with more than 1 parameter work. They have to use ";" as a separator for inputs
72   -- Fixed sqrt(-1) equaling "na" because of the rounding fix from 0.18.1. It does now show "NaN" again
73   -
74   -## [0.18.1] - 2020-06-06
75   -### General
76   -Based on user feedback updated the mod
77   -
78   -### Added
79   -- Shortcut for opening the calculator and automatically focus on the input (Default: Ctrl+Shift+C)
80   -
81   -### Fixed
82   -- Rounding removed 0 at the end, will now stand as it should. So 2.0000001 -> 2.00
83   -- Interpreting "," as "." in the equation, because of some European countries do have a weird keyboard layout
84   -
85   -## [0.18.0] - 2020-06-06
86   -### General
87   -- Initial Release of the mod
88   -- Compatible with Factorio >0.18.0; tested on 0.18.30
89   -- Based on the 4-Function Calculator found in the [Max Rate Calculator](https://mods.factorio.com/mod/MaxRateCalculator) mod by [Theanderblast](https://mods.factorio.com/user/theanderblast)
90   -
91   -### Added
92   -- History of recent calculations
93   -- Possibility to copy recent calculations to the current one (with shift+left-click)
94   -- Substitutes some functions & "constants" of the Lua [math-lib](http://lua-users.org/wiki/MathLibraryTutorial)
95   - - abs() -> math.abs()
96   - - acos() -> math.acos()
97   - - asin() -> math.asin()
98   - - atan() -> math.atan()
99   - - ceil() -> math.ceil()
100   - - floor() -> math.floor()
101   - - cos() -> math.cos()
102   - - sin() -> math.sin()
103   - - tan() -> math.tan()
104   - - deg() -> math.deg()
105   - - rad() -> math.rad()
106   - - exp() -> math.exp()
107   - - log() -> math.log()
108   - - min() -> math.min()
109   - - max() -> math.max()
110   - - modf() -> math.modf()
111   - - sqrt() -> math.sqrt()
112   - - huge -> math.huge
113   - - pi -> math.pi
114   -- Allows the use of "%" (percent sign) in the calculation
115   -- A little easter egg :-)
116   -- Setting for number of decimal places in result (Default: 2). Exact value will be displayed in the tooltip
117   -- Setting if triggering the calculation should clear the current equation (Default: no)
118   -
119   -### Changed
120   -- Made the buttons slightly bigger, so that it's better readable on streams.
121   -- Allows to make "complex" calculations with parentheses
122   -- Allows pretty much all characters in the equation field
123   - - but the "=" (equal sign) will trigger the calculation
124   -
125   -### Removed
126   -- Got rid of the memory functions - but introduced the list of recent calculations instead
127 1 \ No newline at end of file
  2 +---------------------------------------------------------------------------------------------------
  3 +Version: 0.18.6
  4 +Date: 2020-06-11
  5 + Fixed:
  6 + - Percentage calculations fixed; big thanks to GWulf for raising the issue and also providing the fix for it <3
  7 +
  8 +---------------------------------------------------------------------------------------------------
  9 +Version: 0.18.5
  10 +Date: 2020-06-08
  11 + General:
  12 + - Added some fancy sound effects and a special [Nilaus](https://www.youtube.com/c/Nilaus) mode.
  13 + Added:
  14 + - Added sound effects to the calculator whenever a result may be not the desired one (has be enabled in the settings)
  15 + Changed:
  16 + - Emotes will no longer be displayed at default, "Nilaus mode" has to be enabled for the emotes to appear again
  17 + Fixed:
  18 + - Recent results weren't properly cleared in 0.18.4
  19 + Misc:
  20 + - Some code rework, not too fancy stuff
  21 +
  22 +---------------------------------------------------------------------------------------------------
  23 +Version: 0.18.4
  24 +Date: 2020-06-07
  25 + General:
  26 + - Based on user feedback updated the mod
  27 + Added:
  28 + - Added the possibility to copy the results (from recent and also the current) to the display
  29 + Changed:
  30 + - Window now remember last location when opened
  31 + - Updated the BS button (it's backspace people...) so it now has a nice icon instead of the letters
  32 + - Recent results now add to the top, instead of the bottom
  33 + - When calculator is opened it focues on the display for entering the equation
  34 + - You can click pretty much anywhere now and it focues on the display for entering the equation
  35 + Fixed:
  36 + - On multiplayer session the window would lag behind while dragging, because the location would be saved on server. This isn't going to happen anymore, hopefully (not tested yet).
  37 + - When window is moved out of boundaries, when reopened, it will correct itself to be fully in sight again.
  38 + - Settings had weird default values (were set 2 times)
  39 +
  40 +---------------------------------------------------------------------------------------------------
  41 +Version: 0.18.3
  42 +Date: 2020-06-07
  43 + General:
  44 + - A small visual overhaul of the mod
  45 + Added:
  46 + - Added the possibility to "calculate further" (especially usefull when setting "Clear equation on calculation" is set). When the equation doesn't start with a number, character or parenthesis (so it assumes it starts with a math symbol) it will take the previous result and prepend it to the current equation.
  47 + Changed:
  48 + - Updated the UI a bit to match it in color a bit more to the Windows calculator
  49 + - Updated also the icon on the shortcut to better distinguish it
  50 +
  51 +---------------------------------------------------------------------------------------------------
  52 +Version: 0.18.2
  53 +Date: 2020-06-06
  54 + General:
  55 + - Based on user feedback updated the mod
  56 + Added:
  57 + - new easter egg :-)
  58 + - added more math.lib functions
  59 + - atan2() -> math.atan2()
  60 + - cosh() -> math.cosh()
  61 + - sinh() -> math.sinh()
  62 + - tanh() -> math.tanh()
  63 + - log10() -> math.log10()
  64 + - fmod() -> math.fmod()
  65 + - frexp() -> math.frexp()
  66 + - ldexp() -> math.ldexp()
  67 + - pow() -> math.pow()
  68 + Fixed:
  69 + - Interpreting ";" as "," in the equation, because of the fix in 0.18.1, so that math functions with more than 1 parameter work. They have to use ";" as a separator for inputs
  70 + - Fixed sqrt(-1) equaling "na" because of the rounding fix from 0.18.1. It does now show "NaN" again
  71 +
  72 +---------------------------------------------------------------------------------------------------
  73 +Version: 0.18.1
  74 +Date: 2020-06-06
  75 + General:
  76 + - Based on user feedback updated the mod
  77 + Added:
  78 + - Shortcut for opening the calculator and automatically focus on the input (Default: Ctrl+Shift+C)
  79 + Fixed:
  80 + - Rounding removed 0 at the end, will now stand as it should. So 2.0000001 -> 2.00
  81 + - Interpreting "," as "." in the equation, because of some European countries do have a weird keyboard layout
  82 +
  83 +---------------------------------------------------------------------------------------------------
  84 +Version: 0.18.0
  85 +Date: 2020-06-06
  86 + General:
  87 + - Initial Release of the mod
  88 + - Compatible with Factorio >0.18.0; tested on 0.18.30
  89 + - Based on the 4-Function Calculator found in the [Max Rate Calculator](https://mods.factorio.com/mod/MaxRateCalculator) mod by [Theanderblast](https://mods.factorio.com/user/theanderblast)
  90 + Added:
  91 + - History of recent calculations
  92 + - Possibility to copy recent calculations to the current one (with shift+left-click)
  93 + - Substitutes some functions & "constants" of the Lua [math-lib](http://lua-users.org/wiki/MathLibraryTutorial)
  94 + - abs() -> math.abs()
  95 + - acos() -> math.acos()
  96 + - asin() -> math.asin()
  97 + - atan() -> math.atan()
  98 + - ceil() -> math.ceil()
  99 + - floor() -> math.floor()
  100 + - cos() -> math.cos()
  101 + - sin() -> math.sin()
  102 + - tan() -> math.tan()
  103 + - deg() -> math.deg()
  104 + - rad() -> math.rad()
  105 + - exp() -> math.exp()
  106 + - log() -> math.log()
  107 + - min() -> math.min()
  108 + - max() -> math.max()
  109 + - modf() -> math.modf()
  110 + - sqrt() -> math.sqrt()
  111 + - huge -> math.huge
  112 + - pi -> math.pi
  113 + - Allows the use of "%" (percent sign) in the calculation
  114 + - A little easter egg :-)
  115 + - Setting for number of decimal places in result (Default: 2). Exact value will be displayed in the tooltip
  116 + - Setting if triggering the calculation should clear the current equation (Default: no)
  117 + Changed:
  118 + - Made the buttons slightly bigger, so that it's better readable on streams.
  119 + - Allows to make "complex" calculations with parentheses
  120 + - Allows pretty much all characters in the equation field
  121 + - but the "=" (equal sign) will trigger the calculation
  122 + Removed:
  123 + - Got rid of the memory functions - but introduced the list of recent calculations instead
128 124 \ No newline at end of file
... ...
sounds/homeImprovement.ogg
View file @d739390
No preview for this file type
sounds/homeImprovement.xmp
  View file @d739390
... ... @@ -2,34 +2,15 @@
2 2 <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 6.0-c002 79.164360, 2020/02/13-01:07:22 ">
3 3 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
4 4 <rdf:Description rdf:about=""
5   - xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/"
6 5 xmlns:xmp="http://ns.adobe.com/xap/1.0/"
7 6 xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
8 7 xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#"
9 8 xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
10   - xmlns:dc="http://purl.org/dc/elements/1.1/">
11   - <xmpDM:Tracks>
12   - <rdf:Bag>
13   - <rdf:li rdf:parseType="Resource">
14   - <xmpDM:trackName>CuePoint Markers</xmpDM:trackName>
15   - <xmpDM:trackType>Cue</xmpDM:trackType>
16   - <xmpDM:frameRate>f44100</xmpDM:frameRate>
17   - </rdf:li>
18   - <rdf:li rdf:parseType="Resource">
19   - <xmpDM:trackName>CD Track Markers</xmpDM:trackName>
20   - <xmpDM:trackType>Track</xmpDM:trackType>
21   - <xmpDM:frameRate>f44100</xmpDM:frameRate>
22   - </rdf:li>
23   - <rdf:li rdf:parseType="Resource">
24   - <xmpDM:trackName>Subclip Markers</xmpDM:trackName>
25   - <xmpDM:trackType>InOut</xmpDM:trackType>
26   - <xmpDM:frameRate>f44100</xmpDM:frameRate>
27   - </rdf:li>
28   - </rdf:Bag>
29   - </xmpDM:Tracks>
30   - <xmp:MetadataDate>2020-06-08T22:48:45+02:00</xmp:MetadataDate>
31   - <xmp:ModifyDate>2020-06-08T22:48:45+02:00</xmp:ModifyDate>
32   - <xmpMM:InstanceID>xmp.iid:348e6d2e-d8a6-df45-9e77-8ef3de39a2a9</xmpMM:InstanceID>
  9 + xmlns:dc="http://purl.org/dc/elements/1.1/"
  10 + xmlns:xmpDM="http://ns.adobe.com/xmp/1.0/DynamicMedia/">
  11 + <xmp:MetadataDate>2020-06-11T21:27:59+02:00</xmp:MetadataDate>
  12 + <xmp:ModifyDate>2020-06-11T21:27:59+02:00</xmp:ModifyDate>
  13 + <xmpMM:InstanceID>xmp.iid:441f611f-aa4a-c046-8fb0-a5571e0bb4dc</xmpMM:InstanceID>
33 14 <xmpMM:DocumentID>xmp.did:348e6d2e-d8a6-df45-9e77-8ef3de39a2a9</xmpMM:DocumentID>
34 15 <xmpMM:OriginalDocumentID>xmp.did:8b6d840b-f07a-aa4f-9a1d-d8ddd54194ee</xmpMM:OriginalDocumentID>
35 16 <xmpMM:History>
... ... @@ -48,6 +29,20 @@
48 29 <stEvt:softwareAgent>Adobe Audition 13.0 (Windows)</stEvt:softwareAgent>
49 30 <stEvt:changed>/</stEvt:changed>
50 31 </rdf:li>
  32 + <rdf:li rdf:parseType="Resource">
  33 + <stEvt:action>saved</stEvt:action>
  34 + <stEvt:instanceID>xmp.iid:af16a411-701d-3449-87de-83e3753690bd</stEvt:instanceID>
  35 + <stEvt:when>2020-06-11T21:27:59+02:00</stEvt:when>
  36 + <stEvt:softwareAgent>Adobe Audition 13.0 (Windows)</stEvt:softwareAgent>
  37 + <stEvt:changed>/metadata</stEvt:changed>
  38 + </rdf:li>
  39 + <rdf:li rdf:parseType="Resource">
  40 + <stEvt:action>saved</stEvt:action>
  41 + <stEvt:instanceID>xmp.iid:441f611f-aa4a-c046-8fb0-a5571e0bb4dc</stEvt:instanceID>
  42 + <stEvt:when>2020-06-11T21:27:59+02:00</stEvt:when>
  43 + <stEvt:softwareAgent>Adobe Audition 13.0 (Windows)</stEvt:softwareAgent>
  44 + <stEvt:changed>/</stEvt:changed>
  45 + </rdf:li>
51 46 </rdf:Seq>
52 47 </xmpMM:History>
53 48 <xmpMM:DerivedFrom rdf:parseType="Resource">
... ... @@ -56,6 +51,25 @@
56 51 <stRef:originalDocumentID>xmp.did:8b6d840b-f07a-aa4f-9a1d-d8ddd54194ee</stRef:originalDocumentID>
57 52 </xmpMM:DerivedFrom>
58 53 <dc:format>audio/ogg; codec="vorbis"</dc:format>
  54 + <xmpDM:Tracks>
  55 + <rdf:Bag>
  56 + <rdf:li rdf:parseType="Resource">
  57 + <xmpDM:trackName>CuePoint Markers</xmpDM:trackName>
  58 + <xmpDM:trackType>Cue</xmpDM:trackType>
  59 + <xmpDM:frameRate>f44100</xmpDM:frameRate>
  60 + </rdf:li>
  61 + <rdf:li rdf:parseType="Resource">
  62 + <xmpDM:trackName>CD Track Markers</xmpDM:trackName>
  63 + <xmpDM:trackType>Track</xmpDM:trackType>
  64 + <xmpDM:frameRate>f44100</xmpDM:frameRate>
  65 + </rdf:li>
  66 + <rdf:li rdf:parseType="Resource">
  67 + <xmpDM:trackName>Subclip Markers</xmpDM:trackName>
  68 + <xmpDM:trackType>InOut</xmpDM:trackType>
  69 + <xmpDM:frameRate>f44100</xmpDM:frameRate>
  70 + </rdf:li>
  71 + </rdf:Bag>
  72 + </xmpDM:Tracks>
59 73 </rdf:Description>
60 74 </rdf:RDF>
61 75 </x:xmpmeta>
... ...
sounds/nilausFuck1.ogg
View file @d739390
No preview for this file type
sounds/nilausFuck1.xmp
  View file @d739390
... ... @@ -10,8 +10,8 @@
10 10 xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
11 11 xmlns:dc="http://purl.org/dc/elements/1.1/">
12 12 <xmp:CreateDate>1904-01-01T00:00Z</xmp:CreateDate>
13   - <xmp:ModifyDate>2020-06-08T22:51:31+02:00</xmp:ModifyDate>
14   - <xmp:MetadataDate>2020-06-08T22:51:31+02:00</xmp:MetadataDate>
  13 + <xmp:ModifyDate>2020-06-11T21:27:52+02:00</xmp:ModifyDate>
  14 + <xmp:MetadataDate>2020-06-11T21:27:52+02:00</xmp:MetadataDate>
15 15 <xmpDM:duration rdf:parseType="Resource">
16 16 <xmpDM:value>28000</xmpDM:value>
17 17 <xmpDM:scale>1/1000</xmpDM:scale>
... ... @@ -36,7 +36,7 @@
36 36 </rdf:Bag>
37 37 </xmpDM:Tracks>
38 38 <tiff:Orientation>1</tiff:Orientation>
39   - <xmpMM:InstanceID>xmp.iid:19f54cb5-05b0-bd45-9512-cc051c7c1549</xmpMM:InstanceID>
  39 + <xmpMM:InstanceID>xmp.iid:6fa34f64-9809-0c43-acf6-d2f715443d03</xmpMM:InstanceID>
40 40 <xmpMM:DocumentID>xmp.did:19f54cb5-05b0-bd45-9512-cc051c7c1549</xmpMM:DocumentID>
41 41 <xmpMM:OriginalDocumentID>xmp.did:e08c1858-6717-7d41-8e0f-68619fef6920</xmpMM:OriginalDocumentID>
42 42 <xmpMM:History>
... ... @@ -55,6 +55,20 @@
55 55 <stEvt:softwareAgent>Adobe Audition 13.0 (Windows)</stEvt:softwareAgent>
56 56 <stEvt:changed>/</stEvt:changed>
57 57 </rdf:li>
  58 + <rdf:li rdf:parseType="Resource">
  59 + <stEvt:action>saved</stEvt:action>
  60 + <stEvt:instanceID>xmp.iid:5277fef7-a811-ea46-9e77-1960972d00e9</stEvt:instanceID>
  61 + <stEvt:when>2020-06-11T21:27:52+02:00</stEvt:when>
  62 + <stEvt:softwareAgent>Adobe Audition 13.0 (Windows)</stEvt:softwareAgent>
  63 + <stEvt:changed>/metadata</stEvt:changed>
  64 + </rdf:li>
  65 + <rdf:li rdf:parseType="Resource">
  66 + <stEvt:action>saved</stEvt:action>
  67 + <stEvt:instanceID>xmp.iid:6fa34f64-9809-0c43-acf6-d2f715443d03</stEvt:instanceID>
  68 + <stEvt:when>2020-06-11T21:27:52+02:00</stEvt:when>
  69 + <stEvt:softwareAgent>Adobe Audition 13.0 (Windows)</stEvt:softwareAgent>
  70 + <stEvt:changed>/</stEvt:changed>
  71 + </rdf:li>
58 72 </rdf:Seq>
59 73 </xmpMM:History>
60 74 <xmpMM:DerivedFrom rdf:parseType="Resource">
... ...
sounds/nilausFuck2.ogg
View file @d739390
No preview for this file type
sounds/nilausFuck2.xmp
  View file @d739390
... ... @@ -10,8 +10,8 @@
10 10 xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
11 11 xmlns:dc="http://purl.org/dc/elements/1.1/">
12 12 <xmp:CreateDate>1904-01-01T00:00Z</xmp:CreateDate>
13   - <xmp:ModifyDate>2020-06-08T22:53:49+02:00</xmp:ModifyDate>
14   - <xmp:MetadataDate>2020-06-08T22:53:49+02:00</xmp:MetadataDate>
  13 + <xmp:ModifyDate>2020-06-11T21:27:48+02:00</xmp:ModifyDate>
  14 + <xmp:MetadataDate>2020-06-11T21:27:48+02:00</xmp:MetadataDate>
15 15 <xmpDM:duration rdf:parseType="Resource">
16 16 <xmpDM:value>9250</xmpDM:value>
17 17 <xmpDM:scale>1/1000</xmpDM:scale>
... ... @@ -36,7 +36,7 @@
36 36 </rdf:Bag>
37 37 </xmpDM:Tracks>
38 38 <tiff:Orientation>1</tiff:Orientation>
39   - <xmpMM:InstanceID>xmp.iid:88c525af-9cae-674c-9801-4a2338864f83</xmpMM:InstanceID>
  39 + <xmpMM:InstanceID>xmp.iid:3bd395ca-aad3-d64b-b5b7-1b0ecac2538f</xmpMM:InstanceID>
40 40 <xmpMM:DocumentID>xmp.did:88c525af-9cae-674c-9801-4a2338864f83</xmpMM:DocumentID>
41 41 <xmpMM:OriginalDocumentID>xmp.did:4eb6adb6-83de-d64e-ad4a-814c729baa62</xmpMM:OriginalDocumentID>
42 42 <xmpMM:History>
... ... @@ -55,6 +55,20 @@
55 55 <stEvt:softwareAgent>Adobe Audition 13.0 (Windows)</stEvt:softwareAgent>
56 56 <stEvt:changed>/</stEvt:changed>
57 57 </rdf:li>
  58 + <rdf:li rdf:parseType="Resource">
  59 + <stEvt:action>saved</stEvt:action>
  60 + <stEvt:instanceID>xmp.iid:f1084259-ffda-ab43-b4b7-b1454017ccf3</stEvt:instanceID>
  61 + <stEvt:when>2020-06-11T21:27:48+02:00</stEvt:when>
  62 + <stEvt:softwareAgent>Adobe Audition 13.0 (Windows)</stEvt:softwareAgent>
  63 + <stEvt:changed>/metadata</stEvt:changed>
  64 + </rdf:li>
  65 + <rdf:li rdf:parseType="Resource">
  66 + <stEvt:action>saved</stEvt:action>
  67 + <stEvt:instanceID>xmp.iid:3bd395ca-aad3-d64b-b5b7-1b0ecac2538f</stEvt:instanceID>
  68 + <stEvt:when>2020-06-11T21:27:48+02:00</stEvt:when>
  69 + <stEvt:softwareAgent>Adobe Audition 13.0 (Windows)</stEvt:softwareAgent>
  70 + <stEvt:changed>/</stEvt:changed>
  71 + </rdf:li>
58 72 </rdf:Seq>
59 73 </xmpMM:History>
60 74 <xmpMM:DerivedFrom rdf:parseType="Resource">
... ...
sounds/nilausFuck3.ogg
View file @d739390
No preview for this file type
sounds/nilausFuck3.xmp
  View file @d739390
... ... @@ -10,8 +10,8 @@
10 10 xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
11 11 xmlns:dc="http://purl.org/dc/elements/1.1/">
12 12 <xmp:CreateDate>1904-01-01T00:00Z</xmp:CreateDate>
13   - <xmp:ModifyDate>2020-06-08T22:55:39+02:00</xmp:ModifyDate>
14   - <xmp:MetadataDate>2020-06-08T22:55:39+02:00</xmp:MetadataDate>
  13 + <xmp:ModifyDate>2020-06-11T21:27:28+02:00</xmp:ModifyDate>
  14 + <xmp:MetadataDate>2020-06-11T21:27:28+02:00</xmp:MetadataDate>
15 15 <xmpDM:duration rdf:parseType="Resource">
16 16 <xmpDM:value>55104</xmpDM:value>
17 17 <xmpDM:scale>1/1000</xmpDM:scale>
... ... @@ -36,7 +36,7 @@
36 36 </rdf:Bag>
37 37 </xmpDM:Tracks>
38 38 <tiff:Orientation>1</tiff:Orientation>
39   - <xmpMM:InstanceID>xmp.iid:63049797-52fc-df4b-993e-4bc5ff8d05e3</xmpMM:InstanceID>
  39 + <xmpMM:InstanceID>xmp.iid:f3c40aa8-8b36-1c48-b05c-91c5ef9d5382</xmpMM:InstanceID>
40 40 <xmpMM:DocumentID>xmp.did:63049797-52fc-df4b-993e-4bc5ff8d05e3</xmpMM:DocumentID>
41 41 <xmpMM:OriginalDocumentID>xmp.did:e4d64a27-8ddd-f244-b27c-e0ca8738bbbb</xmpMM:OriginalDocumentID>
42 42 <xmpMM:History>
... ... @@ -55,6 +55,20 @@
55 55 <stEvt:softwareAgent>Adobe Audition 13.0 (Windows)</stEvt:softwareAgent>
56 56 <stEvt:changed>/</stEvt:changed>
57 57 </rdf:li>
  58 + <rdf:li rdf:parseType="Resource">
  59 + <stEvt:action>saved</stEvt:action>
  60 + <stEvt:instanceID>xmp.iid:92db2310-a99d-794a-985d-dbd76356f20d</stEvt:instanceID>
  61 + <stEvt:when>2020-06-11T21:27:28+02:00</stEvt:when>
  62 + <stEvt:softwareAgent>Adobe Audition 13.0 (Windows)</stEvt:softwareAgent>
  63 + <stEvt:changed>/metadata</stEvt:changed>
  64 + </rdf:li>
  65 + <rdf:li rdf:parseType="Resource">
  66 + <stEvt:action>saved</stEvt:action>
  67 + <stEvt:instanceID>xmp.iid:f3c40aa8-8b36-1c48-b05c-91c5ef9d5382</stEvt:instanceID>
  68 + <stEvt:when>2020-06-11T21:27:28+02:00</stEvt:when>
  69 + <stEvt:softwareAgent>Adobe Audition 13.0 (Windows)</stEvt:softwareAgent>
  70 + <stEvt:changed>/</stEvt:changed>
  71 + </rdf:li>
58 72 </rdf:Seq>
59 73 </xmpMM:History>
60 74 <xmpMM:DerivedFrom rdf:parseType="Resource">
... ...
sounds/nilausReally.ogg
View file @d739390
No preview for this file type
sounds/nilausReally.xmp
  View file @d739390
... ... @@ -10,8 +10,8 @@
10 10 xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
11 11 xmlns:dc="http://purl.org/dc/elements/1.1/">
12 12 <xmp:CreateDate>1904-01-01T00:00Z</xmp:CreateDate>
13   - <xmp:ModifyDate>2020-06-08T22:56:47+02:00</xmp:ModifyDate>
14   - <xmp:MetadataDate>2020-06-08T22:56:47+02:00</xmp:MetadataDate>
  13 + <xmp:ModifyDate>2020-06-11T21:27:26+02:00</xmp:ModifyDate>
  14 + <xmp:MetadataDate>2020-06-11T21:27:26+02:00</xmp:MetadataDate>
15 15 <xmpDM:duration rdf:parseType="Resource">
16 16 <xmpDM:value>20715</xmpDM:value>
17 17 <xmpDM:scale>1/1000</xmpDM:scale>
... ... @@ -36,7 +36,7 @@
36 36 </rdf:Bag>
37 37 </xmpDM:Tracks>
38 38 <tiff:Orientation>1</tiff:Orientation>
39   - <xmpMM:InstanceID>xmp.iid:a12c3623-760d-1e41-8f2a-672b53d6b765</xmpMM:InstanceID>
  39 + <xmpMM:InstanceID>xmp.iid:ce3279e1-4802-5347-bcff-9a6c33d80c85</xmpMM:InstanceID>
40 40 <xmpMM:DocumentID>xmp.did:a12c3623-760d-1e41-8f2a-672b53d6b765</xmpMM:DocumentID>
41 41 <xmpMM:OriginalDocumentID>xmp.did:a335e3fb-695e-674b-9904-32f8d742164f</xmpMM:OriginalDocumentID>
42 42 <xmpMM:History>
... ... @@ -55,6 +55,20 @@
55 55 <stEvt:softwareAgent>Adobe Audition 13.0 (Windows)</stEvt:softwareAgent>
56 56 <stEvt:changed>/</stEvt:changed>
57 57 </rdf:li>
  58 + <rdf:li rdf:parseType="Resource">
  59 + <stEvt:action>saved</stEvt:action>
  60 + <stEvt:instanceID>xmp.iid:9d325b53-f75e-1246-8a27-42ca0d516535</stEvt:instanceID>
  61 + <stEvt:when>2020-06-11T21:27:26+02:00</stEvt:when>
  62 + <stEvt:softwareAgent>Adobe Audition 13.0 (Windows)</stEvt:softwareAgent>
  63 + <stEvt:changed>/metadata</stEvt:changed>
  64 + </rdf:li>
  65 + <rdf:li rdf:parseType="Resource">
  66 + <stEvt:action>saved</stEvt:action>
  67 + <stEvt:instanceID>xmp.iid:ce3279e1-4802-5347-bcff-9a6c33d80c85</stEvt:instanceID>
  68 + <stEvt:when>2020-06-11T21:27:26+02:00</stEvt:when>
  69 + <stEvt:softwareAgent>Adobe Audition 13.0 (Windows)</stEvt:softwareAgent>
  70 + <stEvt:changed>/</stEvt:changed>
  71 + </rdf:li>
58 72 </rdf:Seq>
59 73 </xmpMM:History>
60 74 <xmpMM:DerivedFrom rdf:parseType="Resource">
... ...
sounds/nilausUgghhhh.ogg
View file @d739390
No preview for this file type
sounds/nilausUgghhhh.xmp
  View file @d739390
... ... @@ -10,8 +10,8 @@
10 10 xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"
11 11 xmlns:dc="http://purl.org/dc/elements/1.1/">
12 12 <xmp:CreateDate>1904-01-01T00:00Z</xmp:CreateDate>
13   - <xmp:ModifyDate>2020-06-08T22:52:37+02:00</xmp:ModifyDate>
14   - <xmp:MetadataDate>2020-06-08T22:52:37+02:00</xmp:MetadataDate>
  13 + <xmp:ModifyDate>2020-06-11T21:27:24+02:00</xmp:ModifyDate>
  14 + <xmp:MetadataDate>2020-06-11T21:27:24+02:00</xmp:MetadataDate>
15 15 <xmpDM:duration rdf:parseType="Resource">
16 16 <xmpDM:value>5952</xmpDM:value>
17 17 <xmpDM:scale>1/1000</xmpDM:scale>
... ... @@ -36,7 +36,7 @@
36 36 </rdf:Bag>
37 37 </xmpDM:Tracks>
38 38 <tiff:Orientation>1</tiff:Orientation>
39   - <xmpMM:InstanceID>xmp.iid:1a789f0f-2049-7541-ba6c-b39c82cd9d35</xmpMM:InstanceID>
  39 + <xmpMM:InstanceID>xmp.iid:f2eea28f-91fd-0440-8a5e-05000636daba</xmpMM:InstanceID>
40 40 <xmpMM:DocumentID>xmp.did:1a789f0f-2049-7541-ba6c-b39c82cd9d35</xmpMM:DocumentID>
41 41 <xmpMM:OriginalDocumentID>xmp.did:aeb5b9ad-7d85-764f-aa5d-4349d913404f</xmpMM:OriginalDocumentID>
42 42 <xmpMM:History>
... ... @@ -55,6 +55,20 @@
55 55 <stEvt:softwareAgent>Adobe Audition 13.0 (Windows)</stEvt:softwareAgent>
56 56 <stEvt:changed>/</stEvt:changed>
57 57 </rdf:li>
  58 + <rdf:li rdf:parseType="Resource">
  59 + <stEvt:action>saved</stEvt:action>
  60 + <stEvt:instanceID>xmp.iid:70ac829b-03e4-d844-9c2e-df8b9065fae3</stEvt:instanceID>
  61 + <stEvt:when>2020-06-11T21:27:24+02:00</stEvt:when>
  62 + <stEvt:softwareAgent>Adobe Audition 13.0 (Windows)</stEvt:softwareAgent>
  63 + <stEvt:changed>/metadata</stEvt:changed>
  64 + </rdf:li>
  65 + <rdf:li rdf:parseType="Resource">
  66 + <stEvt:action>saved</stEvt:action>
  67 + <stEvt:instanceID>xmp.iid:f2eea28f-91fd-0440-8a5e-05000636daba</stEvt:instanceID>
  68 + <stEvt:when>2020-06-11T21:27:24+02:00</stEvt:when>
  69 + <stEvt:softwareAgent>Adobe Audition 13.0 (Windows)</stEvt:softwareAgent>
  70 + <stEvt:changed>/</stEvt:changed>
  71 + </rdf:li>
58 72 </rdf:Seq>
59 73 </xmpMM:History>
60 74 <xmpMM:DerivedFrom rdf:parseType="Resource">
... ...