Handling conflicts 处理冲突

DESIGN.md

@@ -0,0 +1,46 @@
+# Introduction
+
+This document outlines common organizational practices for Blueprint Books (Folders). Ultimately the organization that makes sense to you is the most valuable, but if you are looking for ideas on how to organize to begin your journey this is the place to start.
+
+## Purpose
+
+* Bulk
+* Logistics
+* Power
+* Production
+* Research
+* Smelting
+* Supply
+
+
+
+---
+
+
+* Power
+** Batteries
+** Geneartors
+** Power Lines
+
+* Assemblies
+** 2 Item
+** 3 Item
+** 4 Item
+
+* Storage
+**
+
+* Testing
+
+* Research
+** Blue
+** Red
+** Yellow
+** Purple
+** Green
+** White
+
+* Planets
+** Pizza
+** Divide by fraction?
+** Whole

GLOSSARY.md

@@ -0,0 +1,18 @@
+# Introduction  
+
+The glossary is a list of terms used by the community to describe blueprints. The target audience is for newer players.  
+
+Dense - A type of build that looks to maximize the space used compared to output. Often uses advanced belt/sorter techniques.  
+Pizza - A blueprint that is designed to fix on a portion of the planet based on the fraction used.  
+Black Box - A blueprint which looks to make a product at scale taking in the direct product to output another.  
+Mall / Supermarket - A blueprint which produces typically all buildings and some items (Bots, Shuttles, Vessels, warpers etc.)  
+Spray / Proliferation - Ability to improve an production by speed or quantity.  
+PLS - Planetary Logics System  
+ILS - Interstellar Logics System  
+Sushi - Placing multiple items on a belt and using sorter filtering to pull only the desired component into the production facility.  
+Belt Bending - Advanced belt design which allows the belts to move in directions not naturally expected.  
+UPS - Updates per sec; the rate at which the game runs during End Game.  
+Early Game - Blue-Yellow (Reaching PLS)  
+Mid Game - Yellow-Green (Warpers)  
+Late Game - White  
+End Game - Scaling White and building sphere(s)

README.md

@@ -5,12 +5,16 @@
 
 **!!!强烈建议完整阅读说明!!!**  
 **!!!强烈建议完整阅读说明!!!**  
-**!!!强烈建议完整阅读说明!!!**  
+**!!!强烈建议完整阅读说明!!!** <br>
+**!!!Highly recommend reading the instructions in full!!!**
+**!!!Highly recommend reading the instructions in full!!!**
+**!!!Highly recommend reading the instructions in full!!!**
 
 ---
 
 ## 简介 | Introduction
 
+
 这是游戏[**戴森球计划**](https://store.steampowered.com/app/1366540/_/)中的蓝图仓库，用于储存与分享来自社区的工厂蓝图  
 This is the blueprint repository in the game [**Dyson Sphere Program**](https://store.steampowered.com/app/1366540/_/), used to store and share Factory blueprints from the community
 
@@ -36,29 +40,79 @@ Except for github, you can contact us in these ways: (QQ Group)
 
 ---
 
-## 蓝图仓库使用方法 | HOW TO USE
+## 蓝图仓库使用方法 | How to use the blueprint warehouse
 
-> 蓝图仓库已集成Git与自动更新脚本，无需任何基础也可以正常使用  
-> The Blueprint Repositories has integrated Git and update scripts, which can be used normally without any foundation.
+> 蓝图仓库已集成Git与自动更新脚本，无需任何基础也可以正常使用 <br>
+> The blueprint warehouse has integrated Git and automatic update scripts, which can be used normally without any foundation
 
 ### 第一次下载 | First Download
 
-1. 在电脑上打开github上的蓝图仓库主页: https://github.com/DSPBluePrints/FactoryBluePrints  
-2. Open the home page of Dyson Sphere Program Factory Blueprint on github: https://github.com/DSPBluePrints/FactoryBluePrints
-From this page -> [**Releases**](https://github.com/DSPBluePrints/FactoryBluePrints/releases), download the latest blueprint package, the file name should be called `FactoryBluePrints_X.Y.Z.7z`, please **do not** download from the green Code, **as this does not include all files**!
-1. 解压后，像其他普通的蓝图包一样，放入游戏的默认蓝图文件夹。放进去以后应该是这样：`C:\Users\％用户名称％\Documents\Dyson Sphere Program\Blueprint\FactoryBluePrints\README.md`  
-2. After decompression, put it into the game's default blueprint folder like any other normal blueprint package. After putting it in, it should look like this: `C:\Users\%username%\Documents\Dyson Sphere Program\Blueprint\FactoryBluePrints\README.md`
+1. 在电脑上打开github上的蓝图仓库主页: https://github.com/DSPBluePrints/FactoryBluePrints <br>
+Open the blueprint warehouse homepage on github on your computer: https://github.com/DSPBluePrints/FactoryBluePrints
+2. 从这个页面->[**Releases**](https://github.com/DSPBluePrints/FactoryBluePrints/releases)<-，下载最新的蓝图包，文件名应该叫`FactoryBluePrints_X.Y.Z.7z`，请**不要**从绿色的Code处下载，那样文件不！完！整！<br>
+From this page ->[**Releases**](https://github.com/DSPBluePrints/FactoryBluePrints/releases)<-, download the latest blueprint package, the file name should be `FactoryBluePrints_X.Y.Z.7z`, please **DO NOT** download from the green Code, that file will not work! over! all!
+3. 解压后，像其他普通的蓝图包一样，放入游戏的默认蓝图文件夹。放进去以后应该是这样：`C:\Users\％用户资料％\Documents\Dyson Sphere Program\Blueprint\FactoryBluePrints\README.md` <br>
+After decompression, put it into the game's default blueprint folder like any other normal blueprint package. After putting it in, it should look like this: `C:\Users\%userprofile%\Documents\Dyson Sphere Program\Blueprint\FactoryBluePrints\README.md`
 
 ### 更新 | Update
 
-1. 只需双击即可：`双击更新蓝图仓库.bat`  
-Just Click `双击更新蓝图仓库.bat`  
+1. 只需双击即可：`双击更新蓝图仓库.bat` <br>
+Just double click: `双击更新蓝图仓库.bat`
 
-> 此部分仅供中国大陆地区 | This part is only for Chinese Mainland <!-- No translation required -->  
-> Q: 为什么我打不开蓝图仓库主页 / 下载特别慢 / 更新特别慢？  
-> A: 通常是网络问题。蓝图仓库被托管在github上，可以通过在[Watt Toolkit](https://steampp.net)(原名steam++)中开启github加速服务解决。~~或者魔法？~~  
+> Q: 为什么我打不开蓝图仓库主页 / 下载特别慢 / 更新特别慢？<br>
+Why can't I open the homepage of the blueprint warehouse / the download is very slow / the update is very slow?
+> A: 通常是网络问题。蓝图仓库被托管在github上，可以通过在[Watt Toolkit](https://steampp.net)(原名steam++)中开启github加速服务解决。~~或者魔法？~~ <br>
+A: Usually a network problem. The blueprint warehouse is hosted on github, which can be resolved by enabling the github acceleration service in [Watt Toolkit](https://steampp.net) (formerly known as steam++). ~~ Or magic? ~~
+
+<!--
+
+### 以下内容已过时，出于信息完整性考虑暂不删除，但是已经隐藏
+
+### 视频教程
+
+内容同下方的文字教程，视频时长约1.5min  
+https://www.bilibili.com/video/bv1RK411Z7b2  
+
+---
+
+### 文字教程
+
+#### 基础用法
+
+您可以直接进入[蓝图仓库的网页](https://github.com/DSPBluePrints/FactoryBluePrints)，寻找并打开自己需要的蓝图文件，点击位于蓝图代码右上方的**全选复制**(Copy raw contents)。  
+然后进入游戏，在蓝图页面依次点击**新建空蓝图**，**粘贴**，**保存更改**，就可以将蓝图代码保存到本地，像平常那样使用。  
+
+> 常见问题：  
+> Q: 为什么蓝图仓库网页打开特别慢，我该怎么办？  
+> A: 蓝图仓库被托管在github上，可以通过在[Watt Toolkit](https://steampp.net)(原名steam++)中开启github加速服务解决。~~或者魔法？~~  
+
+#### 进阶用法
+
+如果您有[Git](https://git-scm.com/)的使用基础，**可以将整个蓝图仓库用`clone`命令拉取到游戏的蓝图文件夹内**。这样您将以蓝图合集的形式将完整的蓝图仓库下载到本地，并且可以在游戏内直接访问，享受在线蓝图仓库与游戏无缝衔接的体验。  
+
+```cmd
+git clone https://github.com/DSPBluePrints/FactoryBluePrints.git
+```
+
+> 常见问题：  
+> Q: `error: SSL_read` 相关  
+> A: 通常是网络波动，重试即可。如果已经排除网络问题可以搜索 `git SSL_read` 并逐一排查错误原因，此处不再赘述  
+
+除非你真的非常清楚你正在做什么，否则请不要手动修改`.git`文件夹内的任何文件，这可能导致以后的自动更新出错  
+
+可以通过`pull`命令进行对本地蓝图文件夹进行更新。Git将自动检查上次更新以来发生变动的蓝图/蓝图合集，并以增量更新的形式更新本地仓库  
+**或者直接双击仓库根目录下的"双击更新蓝图仓库.bat"**  
+
+```cmd
+git pull origin main
+```
+-->
+
+---
 
 ## 协议 | Protocol
 
-1. 如果蓝图作者对自己的蓝图发布使用协议，则自从使用协议发布起，对相关蓝图使用蓝图作者发布的使用协议。   If the blueprint author publishes a usage agreement for his own blueprint, the usage agreement published by the blueprint author will be used for the relevant blueprint since the usage agreement is released.
-2. 若无特殊声明，蓝图仓库内的一切蓝图及其他文件使用默认协议：**知识共享 署名-非商业性使用-相同方式共享 4.0 国际(CC BY-NC-SA 4.0)**。   Unless otherwise stated, all blueprints and other files in the blueprint repository use the default license: **Creative Commons Attribution-Non-Commercial-Share Alike 4.0 International (CC BY-NC-SA 4.0)**.
+1. 如果蓝图作者对自己的蓝图发布使用协议，则自从使用协议发布起，对相关蓝图使用蓝图作者发布的使用协议。<br>
+If the blueprint author publishes a usage agreement for his own blueprint, the usage agreement published by the blueprint author will be used for the relevant blueprint since the usage agreement is released.
+2. 若无特殊声明，蓝图仓库内的一切蓝图及其他文件使用默认协议：**知识共享 署名-非商业性使用-相同方式共享 4.0 国际(CC BY-NC-SA 4.0)**。<br>
+Unless otherwise stated, all blueprints and other files in the blueprint repository use the default license: **Creative Commons Attribution-Non-Commercial-Share Alike 4.0 International (CC BY-NC-SA 4.0)**.

TODO.md

@@ -0,0 +1,9 @@
+* Scan popular Blueprints on dysonsphereblueprints.com and add to repo under author's folder.
+    ```css
+    <button id=bp-card-####"
+    class="o-blueprint-card__copy" data-blueprintcopybutton-target="copy" data-clipboard-text=" <% THIS IS THE BLUEPRINT %>
+
+    <div class="o-blueprint-card__votes">
+        <strong class><% COUNT %></strong>
+
+* Determine a method to use git mv to update files as the git history will show deletes and creates for simple renames.