From 906ca1bbe1963afdb089ee069421f0ec13506f2c Mon Sep 17 00:00:00 2001
From: Blackbird88 <Blackbird88@users.noreply.github.com>
Date: Fri, 6 Nov 2020 19:12:40 +0100
Subject: [PATCH 1/2] PS3's PS1 BIOS images

---
 src/core/bios.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/bios.cpp b/src/core/bios.cpp
index 32f69f6d6..8a1c348b9 100644
--- a/src/core/bios.cpp
+++ b/src/core/bios.cpp
@@ -37,7 +37,7 @@ std::string Hash::ToString() const
   return str;
 }
 
-static constexpr std::array<ImageInfo, 25> s_image_infos = {{
+static constexpr std::array<ImageInfo, 27> s_image_infos = {{
   {"SCPH-1000, DTL-H1000 (v1.0)", ConsoleRegion::NTSC_J, MakeHashFromString("239665b1a3dade1b5a52c06338011044")},
   {"SCPH-1001, 5003, DTL-H1201, H3001 (v2.2 12-04-95 A)", ConsoleRegion::NTSC_U,
    MakeHashFromString("924e392ed05558ffdb115408c263dccf")},
@@ -74,7 +74,9 @@ static constexpr std::array<ImageInfo, 25> s_image_infos = {{
   {"SCPH-102 (v4.4 03-24-00 E)", ConsoleRegion::PAL, MakeHashFromString("b10f5e0e3d9eb60e5159690680b1e774")},
   {"SCPH-102 (v4.5 05-25-00 E)", ConsoleRegion::PAL, MakeHashFromString("de93caec13d1a141a40a79f5c86168d6")},
   {"PSP, SCPH-1000R (v4.5 05-25-00 J)", ConsoleRegion::Auto, MakeHashFromString("c53ca5908936d412331790f4426c6c33")},
-  {"SCPH-1000R (v4.5 05-25-00 J)", ConsoleRegion::NTSC_J, MakeHashFromString("476d68a94ccec3b9c8303bbd1daf2810")}
+  {"SCPH-1000R (v4.5 05-25-00 J)", ConsoleRegion::NTSC_J, MakeHashFromString("476d68a94ccec3b9c8303bbd1daf2810")},
+  {"PS3 (v5.0 06/23/03 A)", ConsoleRegion::Auto, MakeHashFromString("fbb5f59ec332451debccf1e377017237")},
+  {"PS3 (v5.0 06/23/03 A)", ConsoleRegion::Auto, MakeHashFromString("81bbe60ba7a3d1cea1d48c14cbcc647b")},
 }};
 
 Hash GetHash(const Image& image)

From a83ac0f0c58f798a135f887d876724be0b29a8a2 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Wed, 11 Nov 2020 00:35:15 +1000
Subject: [PATCH 2/2] Update issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md      | 41 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature_request.md | 20 +++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..98042d422
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,41 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Please read before creating a new issue:
+
+1. All advanced options MUST be at their default values;
+2. All enhancements must be off;
+3. Do not share save state files. Memory Cards are ok;
+4. Please post your issue report in English as unfortunately this is the only language spoken by the developers. The Discord server has many helpful people if you need help translating.
+
+Remove everything before and including this line before submitting.
+
+**Game details**
+[Serial Code, Region]
+[i.e SLUS-00404 Ace Combat 2 (USA)]
+
+**Description of the issue / bug**
+[Describe what you are seeing and/or hearing during gameplay]
+
+**Steps to Reproduce**
+[Try to provide as much detail as possible to reproduce the issue]
+
+**Enhancements information**
+[Make sure they are all turned off before report]
+
+**Hardware/software**
+[If Android, which phone and Android version]
+[If desktop, your CPU, graphics card, and operating system]
+[GPU Renderer - D3D11/OpenGL/Vulkan]
+
+**Emulator version**
+[Shown in the title bar of the emulator]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..bbcbbe7d6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.