Skip to content
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.

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

Adding More Furniture #35272

Closed
wants to merge 20 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
bc4cddf
Adding More Furniture
WhaleyWhaley Nov 3, 2019
6d5542a
Linting
WhaleyWhaley Nov 3, 2019
f0b5b60
Fixing Typos and Color Misnaming
WhaleyWhaley Nov 3, 2019
a5d7b06
Removing "count" definitions
WhaleyWhaley Nov 3, 2019
6161666
Added Furniture to a select few Homes and Businesses
WhaleyWhaley Nov 3, 2019
53bfb8e
Update data/json/furniture_and_terrain/furniture-appliances.json
WhaleyWhaley Nov 3, 2019
ed75981
Update data/json/furniture_and_terrain/furniture-decorative.json
WhaleyWhaley Nov 3, 2019
39f7099
Update data/json/snippets/snippets.json
WhaleyWhaley Nov 3, 2019
ff48342
Update data/json/items/generic.json
WhaleyWhaley Nov 3, 2019
c58d085
Update data/json/snippets/snippets.json
WhaleyWhaley Nov 3, 2019
b02b274
Update data/json/snippets/snippets.json
WhaleyWhaley Nov 3, 2019
f0a91c8
Update data/json/furniture_and_terrain/furniture-seats.json
WhaleyWhaley Nov 3, 2019
d9c063d
Update data/json/furniture_and_terrain/furniture-decorative.json
WhaleyWhaley Nov 3, 2019
e3e7cd1
Update data/json/furniture_and_terrain/furniture-decorative.json
WhaleyWhaley Nov 3, 2019
84481f4
Update data/json/furniture_and_terrain/furniture-decorative.json
WhaleyWhaley Nov 3, 2019
94344d2
Update data/json/furniture_and_terrain/furniture-decorative.json
WhaleyWhaley Nov 3, 2019
2ae55d8
Update data/json/furniture_and_terrain/furniture-decorative.json
WhaleyWhaley Nov 3, 2019
8452013
Update data/json/furniture_and_terrain/furniture-decorative.json
WhaleyWhaley Nov 3, 2019
20298ab
Update data/json/furniture_and_terrain/furniture-seats.json
WhaleyWhaley Nov 3, 2019
1660661
Merge branch 'master' into testbranch
I-am-Erk Dec 16, 2019
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
Prev Previous commit
Next Next commit
Update data/json/items/generic.json
Co-Authored-By: matskuman5 <[email protected]>
  • Loading branch information
WhaleyWhaley and matskuman5 authored Nov 3, 2019
commit ff48342edf423ab1661a30ba61d3ab52ee7a6aa3
2 changes: 1 addition & 1 deletion data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -2994,7 +2994,7 @@
"name": "welcome mat",
"name_plural": "welcome mats",
"snippet_category": "welcome_mats",
"description": "A mat from a homes front door.",
"description": "A mat from a home's front door.",
"price": 0,
"material": "cotton",
"weight": "1200 g",
Expand Down