Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Robbbert committed Dec 18, 2024
2 parents 2bd3187 + 00b8637 commit 5003dcf
Show file tree
Hide file tree
Showing 120 changed files with 6,753 additions and 2,706 deletions.
581 changes: 481 additions & 100 deletions hash/cpc_cass.xml

Large diffs are not rendered by default.

121 changes: 119 additions & 2 deletions hash/ibm5170.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4415,8 +4415,8 @@ license:CC0-1.0
</software>

<software name="winnt31_35">
<description>Windows NT 3.1 (3.10.511.1) [3.5" floppy]</description>
<year>1993</year>
<description>Windows NT 3.1 (3.10.528.1) [3.5" floppy]</description>
<year>1994</year>
<publisher>Microsoft</publisher>
<info name="version" value="3.1"/>
<part name="flop1" interface="floppy_3_5">
Expand Down Expand Up @@ -4531,6 +4531,123 @@ license:CC0-1.0
</part>
</software>

<software name="winnt31o_35" cloneof="winnt31_35">
<description>Windows NT 3.1 (3.10.511.1) [3.5" floppy]</description>
<year>1993</year>
<publisher>Microsoft</publisher>
<info name="version" value="3.1"/>
<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk01.img" size="1474560" crc="94669932" sha1="0b7aaa868e52fde46aa87fc312ee42ad5cb768f2"/>
</dataarea>
</part>
<part name="flop2" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk02.img" size="1474560" crc="c4b1e2f6" sha1="84711308678b78f978cb2b11aec866e709f4f382"/>
</dataarea>
</part>
<part name="flop3" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk03.img" size="1474560" crc="5cd1714f" sha1="60eb00b298421663cac351c09c7f3b94ef63049c"/>
</dataarea>
</part>
<part name="flop4" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk04.img" size="1474560" crc="64bf2d06" sha1="6ffd6a1bc7e69987ab6f84ecb8277dc71e1a2788"/>
</dataarea>
</part>
<part name="flop5" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk05.img" size="1474560" crc="73a9f073" sha1="c4cfbc23b40629ff5ae53bfa674d2a269fdf77ac"/>
</dataarea>
</part>
<part name="flop6" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk06.img" size="1474560" crc="78b7431f" sha1="6e6d3f3922a55fecbe5262c25d17772c9be1c248"/>
</dataarea>
</part>
<part name="flop7" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk07.img" size="1474560" crc="a1184cff" sha1="a740713fc9745ced8d0f82583cee80208d19a4f0"/>
</dataarea>
</part>
<part name="flop8" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk08.img" size="1474560" crc="38efa6f7" sha1="ecff47babb4babecd39fa318af49ee33979f0421"/>
</dataarea>
</part>
<part name="flop9" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk09.img" size="1474560" crc="42bd493c" sha1="00399be20add33ac99faeeadc01992ad35956372"/>
</dataarea>
</part>
<part name="flop10" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk10.img" size="1474560" crc="6d51b1d6" sha1="ec3e3a1b09267eb61c32cbe445dfe7451a3a135e"/>
</dataarea>
</part>
<part name="flop11" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk11.img" size="1474560" crc="f9b3b4fb" sha1="8f66b2ca9233e264683631cdba98aea7ff3c77d4"/>
</dataarea>
</part>
<part name="flop12" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk12.img" size="1474560" crc="48d1707e" sha1="48fc3048b92adc62b0654cf40b4ec9083337ebc3"/>
</dataarea>
</part>
<part name="flop13" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk13.img" size="1474560" crc="16dadeeb" sha1="c736a13a3b72a02c99652da7db1c3c010b354251"/>
</dataarea>
</part>
<part name="flop14" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk14.img" size="1474560" crc="f750286d" sha1="c5bbec5fb9cba8bb38b7f3704834f8c1878fab74"/>
</dataarea>
</part>
<part name="flop15" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk15.img" size="1474560" crc="81ba3114" sha1="e94f4f54cf912f7ab1350642a970c08780d4e121"/>
</dataarea>
</part>
<part name="flop16" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk16.img" size="1474560" crc="dfe5dbf0" sha1="aa2c92efb8d871fa13fb2ff9abaeb2a65c658582"/>
</dataarea>
</part>
<part name="flop17" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk17.img" size="1474560" crc="c185f719" sha1="7d2975c20fdabe78f853aac508a437df144d92fe"/>
</dataarea>
</part>
<part name="flop18" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk18.img" size="1474560" crc="d63dbccd" sha1="c95de45a45801eb8187a5eab92bb97d07fcb6c59"/>
</dataarea>
</part>
<part name="flop19" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk19.img" size="1474560" crc="9a8c7e99" sha1="76c643d42d893575f6f437ceb439cd6e64a0b64c"/>
</dataarea>
</part>
<part name="flop20" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk20.img" size="1474560" crc="7c51a94f" sha1="933cee24943ccc15da69219e9886d1dffb728d22"/>
</dataarea>
</part>
<part name="flop21" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk21.img" size="1474560" crc="29a946f7" sha1="b5ed61e85a62d39988a5b9f3900dfa3711bbe7b4"/>
</dataarea>
</part>
<part name="flop22" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="disk22.img" size="1474560" crc="b4799d79" sha1="a7d82eb9c63e01c854d91e1df1e08a05b99c1bc7"/>
</dataarea>
</part>
</software>

<software name="winnt31as_35" cloneof="winnt31_35">
<description>Windows NT Advanced Server 3.1 (3.10.511.1) [3.5" floppy]</description>
<year>1993</year>
Expand Down
6 changes: 3 additions & 3 deletions hash/ibm5170_cdrom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7520,7 +7520,7 @@ Installation and Open Circulation CDs are bootable.
</part>
<part name="flop" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="en-us windows nt 3.10.528.1 3.5.img" size="1474560" crc="1e2c946b" sha1="7928d1cd298b32e724fc33731184b2a7dbd55b7e"/>
<rom name="en-us windows nt 3.10.528.1 3.5.img" size="1474560" crc="6501bf63" sha1="386d83a2e9fd758272cbbd0beb4148f9e238626e"/>
</dataarea>
</part>
</software>
Expand All @@ -7537,7 +7537,7 @@ Installation and Open Circulation CDs are bootable.
</part>
<part name="flop" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="en-us windows nt 3.10.528.1 3.5.img" size="1474560" crc="1e2c946b" sha1="7928d1cd298b32e724fc33731184b2a7dbd55b7e"/>
<rom name="en-us windows nt 3.10.528.1 3.5.img" size="1474560" crc="6501bf63" sha1="386d83a2e9fd758272cbbd0beb4148f9e238626e"/>
</dataarea>
</part>
</software>
Expand All @@ -7554,7 +7554,7 @@ Installation and Open Circulation CDs are bootable.
</part>
<part name="flop1" interface="floppy_3_5">
<dataarea name="flop" size="1474560">
<rom name="en-us windows nt 3.10.511.1 3.5.img" size="1474560" crc="6501bf63" sha1="386d83a2e9fd758272cbbd0beb4148f9e238626e"/>
<rom name="en-us windows nt 3.10.511.1 3.5.img" size="1474560" status="nodump"/>
</dataarea>
</part>
<part name="flop2" interface="floppy_5_25">
Expand Down
23 changes: 20 additions & 3 deletions hash/mac_cdrom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,36 +29,40 @@ PPC750 - PowerPC 750 (G3) CPU
</diskarea>
</part>
</software>

<!-- Chex Quest duplicated in ibm5170_cdrom.xml -->
<software name="chexquest">
<description>Chex Quest</description>
<year>1996</year>
<publisher>General Mills</publisher>
<!-- TODO: macpwr180c: QuickTime video hiccups -->
<info name="developer" value="Digital Café" />
<part name="cdrom" interface="cdrom">
<diskarea name="cdrom">
<disk name="chex quest" sha1="c90476cc54dfee86bf358c2eb06091ac5859d63a" />
</diskarea>
</part>
</software>

<software name="hexen">
<description>Hexen: Beyond Heretic</description>
<year>1995</year>
<publisher>GT Interactive</publisher>
<info name="developer" value="Raven Software" />
<sharedfeat name="compatibility" value="MC68040,PPC601,PPC603,PPC604" />

<part name="cdrom" interface="cdrom">
<diskarea name="cdrom">
<disk name="hexen" sha1="5a77d58f1a7e648779d681ca9136539104e8b6ae" />
</diskarea>
</part>
</software>

<!-- Discs 1, 2, 3 are in the ibm5170_cdrom.xml as they are PC software. -->
<software name="idanthol">
<description>id Anthology</description>
<year>1996</year>
<publisher>id Software</publisher>
<notes><![CDATA[
Discs 1, 2, 3 are in the ibm5170_cdrom.xml software list as they are PC software.
]]></notes>
<info name="language" value="English" />
<info name="region" value="USA" />
<part name="cdrom4" interface="cdrom">
Expand All @@ -67,6 +71,7 @@ PPC750 - PowerPC 750 (G3) CPU
</diskarea>
</part>
</software>

<software name="mac70a9">
<description>System Software 7.0a9 ("Big Bang" pre-release)</description>
<year>1991</year>
Expand All @@ -78,6 +83,7 @@ PPC750 - PowerPC 750 (G3) CPU
</diskarea>
</part>
</software>

<software name="mac71">
<description>System Software 7.1 (US English)</description>
<year>1992</year>
Expand All @@ -89,6 +95,7 @@ PPC750 - PowerPC 750 (G3) CPU
</diskarea>
</part>
</software>

<software name="mac712p_q630">
<description>Performa CD (System 7.1.2P for Quadra 630 and LC/Performa 580) (US English)</description>
<year>1994</year>
Expand All @@ -100,6 +107,7 @@ PPC750 - PowerPC 750 (G3) CPU
</diskarea>
</part>
</software>

<software name="mac75">
<description>System Software 7.5 (US English)</description>
<year>1994</year>
Expand All @@ -111,6 +119,7 @@ PPC750 - PowerPC 750 (G3) CPU
</diskarea>
</part>
</software>

<software name="mac753">
<description>System Software 7.5.3 (US English)</description>
<year>1996</year>
Expand All @@ -122,6 +131,7 @@ PPC750 - PowerPC 750 (G3) CPU
</diskarea>
</part>
</software>

<software name="mac76">
<description>Mac OS 7.6 (US English)</description>
<year>1997</year>
Expand All @@ -134,6 +144,7 @@ PPC750 - PowerPC 750 (G3) CPU
</diskarea>
</part>
</software>

<software name="mac76_de">
<description>Mac OS 7.6 (German)</description>
<year>1997</year>
Expand All @@ -146,6 +157,7 @@ PPC750 - PowerPC 750 (G3) CPU
</diskarea>
</part>
</software>

<software name="mac761">
<description>Mac OS 7.6.1 (US English)</description>
<year>1997</year>
Expand All @@ -158,6 +170,7 @@ PPC750 - PowerPC 750 (G3) CPU
</diskarea>
</part>
</software>

<software name="mac80_jp">
<description>Mac OS 8 (Japanese)</description>
<year>1997</year>
Expand All @@ -170,6 +183,7 @@ PPC750 - PowerPC 750 (G3) CPU
</diskarea>
</part>
</software>

<software name="mac81">
<description>Mac OS 8.1 (US English)</description>
<year>1998</year>
Expand All @@ -182,6 +196,7 @@ PPC750 - PowerPC 750 (G3) CPU
</diskarea>
</part>
</software>

<!-- Mac OS 7.0.1-9.x -->
<software name="mfma_addsub">
<description>My First Math Adventure: Adding and Subtracting</description>
Expand All @@ -194,6 +209,7 @@ PPC750 - PowerPC 750 (G3) CPU
</diskarea>
</part>
</software>

<software name="pwrmaccd">
<description>Power Macintosh 6100/7100/8100 CD (System Software 7.1.2P) (US English)</description>
<year>1994</year>
Expand All @@ -206,6 +222,7 @@ PPC750 - PowerPC 750 (G3) CPU
</diskarea>
</part>
</software>

<software name="ultdoom">
<description>The Ultimate Doom</description>
<year>1995</year>
Expand Down
Loading

0 comments on commit 5003dcf

Please sign in to comment.