Skip to content

Commit 4b68677

Browse files
authored
Merge pull request Worldbuilding#11 from Laogeodritt/dev/laogeodritt/1.3
v1.3 beta 1 - ready for internal testing
2 parents 4c56a5b + a656881 commit 4b68677

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+3822
-726
lines changed

.gitignore

+173-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,176 @@
1+
# Project-specific files
2+
config.json
3+
config-*.json
4+
dict.json
5+
state.json
6+
client_secret.json
7+
*.sublime-*
8+
*.sqlite
9+
10+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
11+
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
12+
13+
# User-specific stuff:
14+
.idea/**/workspace.xml
15+
.idea/**/tasks.xml
16+
.idea/dictionaries
17+
18+
# Sensitive or high-churn files:
19+
.idea/**/dataSources/
20+
.idea/**/dataSources.ids
21+
.idea/**/dataSources.xml
22+
.idea/**/dataSources.local.xml
23+
.idea/**/sqlDataSources.xml
24+
.idea/**/dynamic.xml
25+
.idea/**/uiDesigner.xml
26+
27+
# Gradle:
28+
.idea/**/gradle.xml
29+
.idea/**/libraries
30+
31+
# CMake
32+
cmake-build-debug/
33+
cmake-build-release/
34+
35+
# Mongo Explorer plugin:
36+
.idea/**/mongoSettings.xml
37+
38+
## File-based project format:
39+
*.iws
40+
41+
## Plugin-specific files:
42+
43+
# IntelliJ
44+
out/
45+
46+
# mpeltonen/sbt-idea plugin
47+
.idea_modules/
48+
49+
# JIRA plugin
50+
atlassian-ide-plugin.xml
51+
52+
# Cursive Clojure plugin
53+
.idea/replstate.xml
54+
55+
# Crashlytics plugin (for Android Studio and IntelliJ)
56+
com_crashlytics_export_strings.xml
57+
crashlytics.properties
58+
crashlytics-build.properties
59+
fabric.properties
60+
61+
62+
# ======
63+
# python: https://github.com/github/gitignore/blob/2ec038e57823196efe4f4745274e58a70a22ed04/Python.gitignore
64+
# ======
65+
# Byte-compiled / optimized / DLL files
66+
__pycache__/
67+
*.py[cod]
68+
*$py.class
69+
70+
# C extensions
71+
*.so
72+
73+
# Distribution / packaging
74+
.Python
75+
build/
76+
develop-eggs/
77+
dist/
78+
downloads/
79+
eggs/
80+
.eggs/
81+
lib/
82+
lib64/
83+
parts/
84+
sdist/
85+
var/
86+
wheels/
87+
*.egg-info/
88+
.installed.cfg
89+
*.egg
90+
MANIFEST
91+
92+
# PyInstaller
93+
# Usually these files are written by a python script from a template
94+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
95+
*.manifest
96+
*.spec
97+
98+
# Installer logs
99+
pip-log.txt
100+
pip-delete-this-directory.txt
101+
102+
# Unit test / coverage reports
103+
htmlcov/
104+
.tox/
105+
.coverage
106+
.coverage.*
107+
.cache
108+
nosetests.xml
109+
coverage.xml
110+
*.cover
111+
.hypothesis/
112+
113+
# Translations
114+
*.mo
115+
*.pot
116+
117+
# Django stuff:
118+
*.log
119+
.static_storage/
120+
.media/
121+
local_settings.py
122+
123+
# Flask stuff:
124+
instance/
125+
.webassets-cache
126+
127+
# Scrapy stuff:
128+
.scrapy
129+
130+
# Sphinx documentation
131+
docs/_build/
132+
133+
# PyBuilder
134+
target/
135+
136+
# Jupyter Notebook
137+
.ipynb_checkpoints
138+
139+
# pyenv
140+
.python-version
141+
142+
# celery beat schedule file
143+
celerybeat-schedule
144+
145+
# SageMath parsed files
146+
*.sage.py
147+
148+
# Environments
149+
.env
150+
.venv
151+
env/
152+
venv/
153+
ENV/
154+
env.bak/
155+
venv.bak/
156+
157+
# Spyder project settings
158+
.spyderproject
159+
.spyproject
160+
161+
# Rope project settings
162+
.ropeproject
163+
164+
# mkdocs documentation
165+
/site
166+
167+
# mypy
168+
.mypy_cache/
169+
170+
# =========================
171+
# Operating System Files
172+
# =========================
173+
1174
# Windows image file caches
2175
Thumbs.db
3176
ehthumbs.db
@@ -17,9 +190,6 @@ $RECYCLE.BIN/
17190
# Windows shortcuts
18191
*.lnk
19192

20-
# =========================
21-
# Operating System Files
22-
# =========================
23193

24194
# OSX
25195
# =========================

.idea/codeStyleSettings.xml

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/Project_Default.xml

+19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

KazTron.iml

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module type="PYTHON_MODULE" version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="true">
4+
<exclude-output />
5+
<content url="file://$MODULE_DIR$" />
6+
<orderEntry type="inheritedJdk" />
7+
<orderEntry type="sourceFolder" forTests="false" />
8+
</component>
9+
</module>

0 commit comments

Comments
 (0)