Skip to content

Commit

Permalink
Merge pull request #16 from Glockshna/0.2.0
Browse files Browse the repository at this point in the history
## Changelog: 
* +Added Filter Side Inserters [Enhancement #2]
* +Added Extra Long Inserters [Enhancement #3]
* *Changed placeholder recipes for all inserters to Fast Inserter + 5 gears until the balance patch.
  • Loading branch information
Glockshna committed Jul 11, 2016
2 parents ace5e24 + bc55ce2 commit 7efb8ed
Show file tree
Hide file tree
Showing 96 changed files with 3,587 additions and 2,236 deletions.
2,214 changes: 0 additions & 2,214 deletions GMod_0.1.1/prototypes/inserters.lua

This file was deleted.

File renamed without changes.
File renamed without changes.
Binary file added GMod_0.2.0/graphics/icons/extralong-electric.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added GMod_0.2.0/graphics/icons/extralong-motorized.png
Binary file added GMod_0.2.0/graphics/icons/extralong-veryfast.png
File renamed without changes
Binary file added GMod_0.2.0/graphics/icons/filter-left-fast.png
File renamed without changes
Binary file added GMod_0.2.0/graphics/icons/filter-right-fast.png
Binary file added GMod_0.2.0/graphics/icons/filter-stack-fast.png
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
2 changes: 1 addition & 1 deletion GMod_0.1.1/info.json → GMod_0.2.0/info.json
@@ -1,6 +1,6 @@
{
"name": "GMod",
"version": "0.1.1",
"version": "0.2.0",
"title": "Glockshna's Bits N Bobs",
"author": "Glockshna",
"homepage": "ripme.xyz",
Expand Down
72 changes: 52 additions & 20 deletions GMod_0.1.1/locale/en/en.cfg → GMod_0.2.0/locale/en/en.cfg
@@ -1,41 +1,73 @@
[item-name]
gm-very-fast-inserter=Very Fast Inserter
gm-very-fast-filter-inserter=Very Fast Filter Inserter
gm-very-fast-long-inserter=Very Fast Long Inserter
gm-very-fast-inserter-left=Very Fast Left Inserter
gm-very-fast-inserter-right=Very Fast Left Inserter

gm-very-fast-inserter=Very Fast Inserter
gm-motorized-inserter=Motorized Inserter
gm-motorized-filter-inserter=Motorized Filter Inserter
gm-motorized-long-inserter=Motorized Long Inserter
gm-motorized-inserter-left=Motorized Left Inserter
gm-motorized-inserter-right=Motorized Right Inserter

gm-electric-inserter=Electric Inserter

gm-very-fast-filter-inserter=Very Fast Filter Inserter
gm-motorized-filter-inserter=Motorized Filter Inserter
gm-electric-filter-inserter=Electric Filter Inserter

gm-very-fast-long-inserter=Very Fast Long Inserter
gm-motorized-long-inserter=Motorized Long Inserter
gm-electric-long-inserter=Electric Long Inserter

gm-very-fast-inserter-left=Very Fast Left Inserter
gm-motorized-inserter-left=Motorized Left Inserter
gm-electric-inserter-left=Electric Left Inserter

gm-very-fast-inserter-right=Very Fast Right Inserter
gm-motorized-inserter-right=Motorized Right Inserter
gm-electric-inserter-right=Electric Right Inserter

gm-very-fast-inserter-right-filter=Very Fast Right Filter Inserter
gm-motorized-inserter-right-filter=Motorized Right Filter Inserter
gm-electric-inserter-right-filter=Electric Right Filter Inserter

gm-very-fast-inserter-left-filter=Very Fast Left Filter Inserter
gm-motorized-inserter-left-filter=Motorized Left Filter Inserter
gm-electric-inserter-left-filter=Electric Left Filter Inserter

gm-very-fast-extra-long-inserter=Very Fast Very Long Inserter
gm-motorized-extra-long-inserter=Motorized Very Long Inserter
gm-electric-extra-long-inserter=Electric Very Long Inserter

[entity-name]
gm-very-fast-inserter=Very Fast Inserter
gm-very-fast-filter-inserter=Very Fast Filter Inserter
gm-very-fast-long-inserter=Very Fast Long Inserter
gm-very-fast-inserter-left=Very Fast Left Inserter
gm-very-fast-inserter-right=Very Fast Right Inserter

gm-very-fast-inserter=Very Fast Inserter
gm-motorized-inserter=Motorized Inserter
gm-motorized-filter-inserter=Motorized Filter Inserter
gm-motorized-long-inserter=Motorized Long Inserter
gm-motorized-inserter-left=Motorized Left Inserter
gm-motorized-inserter-right=Motorized Right Inserter

gm-electric-inserter=Electric Inserter

gm-very-fast-filter-inserter=Very Fast Filter Inserter
gm-motorized-filter-inserter=Motorized Filter Inserter
gm-electric-filter-inserter=Electric Filter Inserter

gm-very-fast-long-inserter=Very Fast Long Inserter
gm-motorized-long-inserter=Motorized Long Inserter
gm-electric-long-inserter=Electric Long Inserter


gm-very-fast-inserter-left=Very Fast Left Inserter
gm-motorized-inserter-left=Motorized Left Inserter
gm-electric-inserter-left=Electric Left Inserter

gm-very-fast-inserter-right=Very Fast Right Inserter
gm-motorized-inserter-right=Motorized Right Inserter
gm-electric-inserter-right=Electric Right Inserter

gm-very-fast-inserter-right-filter=Very Fast Right Filter Inserter
gm-motorized-inserter-right-filter=Motorized Right Filter Inserter
gm-electric-inserter-right-filter=Electric Right Filter Inserter


gm-very-fast-inserter-left-filter=Very Fast Left Filter Inserter
gm-motorized-inserter-left-filter=Motorized Left Filter Inserter
gm-electric-inserter-left-filter=Electric Left Filter Inserter

gm-very-fast-extra-long-inserter=Very Fast Very Long Inserter
gm-motorized-extra-long-inserter=Motorized Very Long Inserter
gm-electric-extra-long-inserter=Electric Very Long Inserter

[entity-description]
gm-very-fast-inserter=A refined pneumatic inserter. Twice as fast as a Fast Inserter.
gm-very-fast-filter-inserter=Filterable Very Fast Inserter
Expand Down
Expand Up @@ -52,4 +52,18 @@ data:extend(
order = 6,
},

{
type = "item-subgroup",
name = "gm-left-filter-inserters",
group = "GMod",
order = 7,
},

{
type = "item-subgroup",
name = "gm-right-filter-inserters",
group = "GMod",
order = 8,
},

})

0 comments on commit 7efb8ed

Please sign in to comment.