Skip to content

Wtf are you doing? #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PyroFire232 wants to merge 58 commits into
base: master
Choose a base branch
from
Open

Wtf are you doing? #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
4d4ce94
Updating files for 0.2.8
jimmyjon711 Dec 26, 2017
3e4e0ee
Updating to work with Factorio Version 0.16
jimmyjon711 Dec 26, 2017
115cd52
Added HR graphics
jimmyjon711 Feb 3, 2018
4b32332
Collision box, and fast replaceables
jimmyjon711 Feb 11, 2018
e96de8d
Resolved issue #1
jimmyjon711 Feb 17, 2018
76a328f
Updating info file
jimmyjon711 Feb 17, 2018
dc090fa
Changed name to Extended Plus, adjusted science, added exoskeleton mk…
jimmyjon711 Feb 25, 2018
1c896b1
Updating license
jimmyjon711 Feb 25, 2018
cb0e26a
Adding git attributes
jimmyjon711 Feb 25, 2018
5badb77
Committing changes
jimmyjon711 Mar 13, 2018
c04d19c
- Re-balancing science
jimmyjon711 Mar 30, 2018
968d83a
Updating date
jimmyjon711 Mar 30, 2018
2805d8a
Starting update to 0.17
jimmyjon711 Mar 1, 2019
88510ae
Removed all flags for "goes-to-quickbar" and "goes-to-main-inventory"…
jimmyjon711 Mar 1, 2019
3778b0d
Updating change log and date
jimmyjon711 Mar 1, 2019
889c1a5
Merge pull request #3 from jimmyjon711/0_17_update
jimmyjon711 Mar 1, 2019
53ae661
Removed accumulator charge animation
jimmyjon711 Mar 2, 2019
71e7844
Updating accumulator graphics and properties
jimmyjon711 Mar 2, 2019
e5fcf67
Updating boiler graphics and properties
jimmyjon711 Mar 2, 2019
c3644a4
Updating steam-engine graphics and properties
jimmyjon711 Mar 2, 2019
42c21a7
Updating power poles graphics and properties
jimmyjon711 Mar 2, 2019
51282c2
Moving solar panel graphics to their appropriate folders, updating pr…
jimmyjon711 Mar 2, 2019
bd71d00
Updating substation graphics, updating substation properties
jimmyjon711 Mar 2, 2019
164b081
Updating mining speed and version/date
jimmyjon711 Mar 3, 2019
7541b97
Updating changelog
jimmyjon711 Mar 3, 2019
a0e9a0e
Changing effectivity to 1 to match base game, Close #5
jimmyjon711 Mar 10, 2019
673e17e
Updated prerequisites to match factorio update 0.17.23
jimmyjon711 Mar 29, 2019
832d256
Updating to fix mod conflict
jimmyjon711 Jul 2, 2019
6471378
Fixes #9, removing loop for setting accumulators collision box and fa…
jimmyjon711 Sep 7, 2019
5b83640
Updating changelog
jimmyjon711 Sep 7, 2019
9338c38
Changes :
billbo99 Dec 30, 2019
ede525e
Merge pull request #10 from billbo99/master
jimmyjon711 Jan 11, 2020
da64ed9
Updating info file
jimmyjon711 Jan 11, 2020
86889bb
Fixing changelog so that it can be read within the game
jimmyjon711 Jan 11, 2020
1c47e68
Merge pull request #1 from jimmyjon711/master
billbo99 Jan 21, 2020
3044e90
Increment json to support 0.18
billbo99 Jan 21, 2020
ad826a4
Merge pull request #11 from billbo99/master
jimmyjon711 Jan 25, 2020
d0292d4
General code refactor
billbo99 Jan 31, 2020
6756556
Cleared icon_mipmaps warnings
billbo99 Feb 7, 2020
54d84fe
Merge pull request #13 from billbo99/General-code-refactor
jimmyjon711 Feb 9, 2020
3abec8e
Merge pull request #2 from jimmyjon711/master
billbo99 Feb 10, 2020
3ecddcd
Updated setting for normal graphics on mk2/mk3 big power poles. Fixes…
jimmyjon711 Feb 15, 2020
f563279
Updating substation maximum_wire_distance and supply_area_distance. F…
jimmyjon711 Feb 15, 2020
4f4c963
Updating changelog and version
jimmyjon711 Feb 15, 2020
398a15a
Merge pull request #3 from jimmyjon711/master
billbo99 Feb 15, 2020
4121200
icon_update
billbo99 Aug 31, 2020
4f6b19b
cleanup
billbo99 Aug 31, 2020
d207a1e
missing mips icons
billbo99 Aug 31, 2020
04fc479
Merge pull request #23 from billbo99/icon_update
jimmyjon711 Sep 7, 2020
5151144
Updating version and changelog to 1.0.0
jimmyjon711 Sep 7, 2020
a4b58ce
icons showing up as wrong size in upgrade planner
billbo99 Sep 10, 2020
fa67517
Merge pull request #24 from billbo99/entity_icons
jimmyjon711 Sep 13, 2020
4996c8a
Updating version and changelog
jimmyjon711 Sep 13, 2020
0658dce
moved next_upgrade/fast_replaceable_group to data-updates.lua
billbo99 Nov 13, 2020
72ef52a
Merge pull request #26 from billbo99/next_upgrade
jimmyjon711 Nov 21, 2020
fef23db
Updating version and changelog
jimmyjon711 Nov 21, 2020
4d35452
1.1
billbo99 Nov 24, 2020
72b757b
Merge pull request #29 from billbo99/factorio_1.1
jimmyjon711 Nov 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
root = true

[*]
indent_style = space
indent_size = 4
charset = utf-8
trim_trailing_whitespace = false
insert_final_newline = false
9 changes: 9 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.gitignore export-ignore
.gitattributes export-ignore

* text=auto
* text eol=lf

*.png binary
*.jpg binary
*.ogg binary
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,4 @@ luac.out
*.x86_64
*.hex

.vscode/
Loading