Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
TeamSpen210 committed Jan 14, 2021
2 parents 8296af8 + d1fb55b commit dd6eece
Show file tree
Hide file tree
Showing 6 changed files with 133 additions and 39 deletions.
34 changes: 34 additions & 0 deletions .github/ISSUE_TEMPLATE/build-error.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
name: Build Error
about: Report a map building error
title: ''
labels: Bug, Compile Error
assignees: ''

---

<!--
If this is your first time opening an issue here, please read the contributing guidelines (there's a link below this text box). Remember:
- Make sure you're in the right place - app issues should go on BEE2.4
- Perform a search to make sure this issue hasn't already been reported
- Do not use the issue tracker to ask questions
- Issues should not be combined, unless they are very closely related (e.g. two bugs with a specific item in a specific case)
-->

<!-- Specify the version of BEE2.4 you were using when this error occurred. -->
**BEE2 Version:**

<!--
When a map fails to build, Portal 2 will print an error log to the developer console.
It appears as a large block of red text, usually starting with "VBSP Failed". Copy this and paste it below.
If you don't know how to open the developer console, look it up online.
-->
<details>
<summary>Error Log</summary>
<!-- Paste the error log here: -->


</details>

<!-- Provide any additional information about the error. -->
**Additional information:**
34 changes: 34 additions & 0 deletions .github/ISSUE_TEMPLATE/generic-bug-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
name: Generic Bug Report
about: Create a report to help us improve
title: ''
labels: Bug
assignees: ''

---

<!--
If this is your first time opening an issue here, please read the contributing guidelines (there's a link below this text box). Remember:
- Make sure you're in the right place - app issues should go on BEE2.4
- Perform a search to make sure this issue hasn't already been reported
- Do not use the issue tracker to ask questions
- Issues should not be combined, unless they are very closely related (e.g. two bugs with a specific item in a specific case)
-->

<!-- Specify the version of BEE2.4 you were using when this bug occurred. -->
**BEE2 version:**

<!-- Provide a clear and concise description of the bug. -->
**Description of the bug:**


<!-- Provide a clear and concise description of what you expected to happen. -->
**Expected behavior:**


<!-- Explain the steps taken to reproduce the bug. -->
**Steps to reproduce:**


<!-- Provide any console errors that appear, and screenshots or videos of the bug -->
**Additional information:**
27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE/generic-feature-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
name: Generic Feature Request
about: Suggest an idea for the mod
title: ''
labels: Enhancement
assignees: ''

---

<!--
If this is your first time opening an issue here, please read the contributing guidelines (there's a link below this text box). Remember:
- Make sure you're in the right place - app issues should go on BEE2.4
- Perform a search to make sure this issue hasn't already been reported
- Do not use the issue tracker to ask questions
- Issues should not be combined, unless they are very closely related (e.g. two bugs with a specific item in a specific case)
-->

<!-- Provide a clear and concise description of what you want to happen. -->
**Description of the feature:**


<!-- Explain what problems this feature would solve, or otherwise why it should be implemented. -->
**This should be implemented because:**


<!-- Provide any additional information that might be helpful. -->
**Additional information:**
35 changes: 35 additions & 0 deletions .github/ISSUE_TEMPLATE/new-item.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---
name: New Item
about: Suggest a new item
title: ''
labels: New Item
assignees: ''

---

<!--
If this is your first time opening an issue here, please read the contributing guidelines (there's a link below this text box). Remember:
- Make sure you're in the right place - app issues should go on BEE2.4
- Perform a search to make sure this issue hasn't already been reported
- Do not use the issue tracker to ask questions
- Issues should not be combined, unless they are very closely related (e.g. two bugs with a specific item in a specific case)
Additionally:
- Items should already be present in the base game or an existing map/mod
- No beta content
- Focus on puzzle usage and flexibility
-->

<!-- Provide a clear and concise description of what the item is, and how it should behave. -->
**Description of the item:**


<!-- List any options the item should have (in its right-click menu or the Style/Item Properties window).-->
**Item options:**


<!-- Provide a link to the original map or mod the item is from, if applicable. -->
**Source:**

<!-- Provide any additional information that might be helpful. -->
**Additional information:**
36 changes: 0 additions & 36 deletions .github/contributing.md

This file was deleted.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[![BEE2-items Releases](https://img.shields.io/github/downloads/BEEmod/BEE2-items/total.svg?label=Packages)](https://github.com/BEEmod/BEE2-items/releases)
[![BEE2.4 Releases](https://img.shields.io/github/downloads/BEEmod/BEE2.4/total.svg?label=App)](https://github.com/BEEmod/BEE2.4/releases)

### Please read the [Contributing Guidelines](https://github.com/BEEmod/BEE2-items/blob/master/.github/contributing.md), [FAQ](https://github.com/BEEmod/BEE2-items/wiki/FAQ), and [known issues list](https://github.com/BEEmod/BEE2-items/wiki/Known-Issues) before opening an issue.
### Please read the [Contributing Guidelines](https://github.com/BEEmod/.github/blob/master/contributing.md), [FAQ](https://github.com/BEEmod/BEE2-items/wiki/FAQ), and [known issues list](https://github.com/BEEmod/BEE2-items/wiki/Known-Issues) before opening an issue.

![BEE2 Icon](https://raw.githubusercontent.com/BEEmod/BEE2.4/master/bee2.ico)
![BEE2 Icon](https://raw.githubusercontent.com/BEEmod/BEE2.4/master/BEE2.ico)
# BEE2.4 Default Pack
This is the default set of packages for the [BEE2.4](https://github.com/BEEmod/BEE2.4). Packages contain resources for BEE2.4, such as items or styles.

Expand Down Expand Up @@ -34,7 +34,7 @@ These are instructions to install the development version of the Default Pack. T
For some things to work correctly, you may need to use this with the development version of the application/compiler. Instructions for how to install this can be found [here](https://github.com/BEEmod/BEE2.4#build-from-source-advanced-for-adding-to-bee24-program-windows).

1. If you don't already have one, download and install a Git client such as [GitHub Desktop](https://desktop.github.com/), or [command-line Git](https://git-scm.com/).
2. Clone this repository to your computer. If you are using GitHub Desktop, this can be done with the "Clone or Download" button above.
2. Clone this repository to your computer. If you are using GitHub Desktop, this can be done with the green "download" button at the top of this page.
3. Once it is finished, select the branch you want to sync changes from. `master`, the default branch, is the release version. `dev` contains features which will be in the next update. There are also various other branches available, for testing different features.
4. Open `%appdata%/BEEMOD2/config/config.cfg` in a text editor. <!--TODO: Where are these files/directories located on Mac?-->
5. Set the package directory to the `packages` folder within your cloned repository folder. If using GitHub Desktop, this will default to `C:\Users\<yourname>\Documents\GitHub\BEE2-items\packages`.
Expand Down

0 comments on commit dd6eece

Please sign in to comment.