Skip to content

Commit d8f2062

Browse files
authored
Merge pull request #495 from Joshua119/dev
Dev
2 parents f33ee57 + b3f5ce6 commit d8f2062

3 files changed

Lines changed: 28 additions & 1 deletion

File tree

src/components/reference/TextureReferencePage.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ export default class TextureReference extends React.Component {
7474
<TableCell>Name</TableCell>
7575
<TableCell></TableCell>
7676
<TableCell className='texture'>Image</TableCell>
77+
<TableCell className='creator'>Image Creator</TableCell>
7778
<TableCell className='texRefExample'>Example</TableCell>
7879
</TableRow>
7980
</TableHead>
@@ -85,6 +86,7 @@ export default class TextureReference extends React.Component {
8586
<TableCell >
8687
<img id="image" src={this.imageHelper(row.image)} alt="alt" height = "90" width = "90"></img>
8788
</TableCell>
89+
<TableCell >{row.creator}</TableCell>
8890
<TableCell >{this.exampleHelper(row.example)}</TableCell>
8991
</TableRow>
9092
))}

src/components/structural/Textures.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
let TexturePack = [
22
{title:"bricks",url:"/img/textures/bricks.jpg"},
33
{title:"bark",url:"/img/textures/bark.jpg"},
4-
{title:"checkerboard",url:"/img/textures/checkerboard.png"},
4+
{title:"checkerboard",url:"/img/textures/checkerboard.jpg"},
55
{title:"chevron",url:"/img/textures/chevron.jpg"},
66
{title:"cobblestone",url:"/img/textures/cobblestone.jpg"},
77
{title:"dirt",url:"/img/textures/dirt.jpg"},
8+
{title:"duck",url:"/img/textures/duck.jpg"},
89
{title:"fabric",url:"/img/textures/fabric.jpg"},
910
{title:"grass",url:"/img/textures/grass.jpg"},
1011
{title:"lava",url:"/img/textures/lava.jpg"},

src/myr/textureReference.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,91 +129,115 @@ let texture = [
129129
{
130130
name: "bricks",
131131
image: "bricks",
132+
creator: "“Caveman Chuck” Coker",
132133
example: "bricks",
133134
},
134135
{
135136
name: "bark",
136137
image: "bark",
138+
creator: "Jacob Gube",
137139
example: "bark",
138140
},
139141
{
140142
name: "checkerboard",
141143
image: "checkerboard",
144+
creator: "Indolences",
142145
example: "checkerboard",
143146
},
144147
{
145148
name: "chevron",
146149
image: "chevron",
150+
creator: "Melstampz",
147151
example: "chevron",
148152
},
149153
{
150154
name: "cobblestone",
151155
image: "cobblestone",
156+
creator: "Tiling Tom",
152157
example: "cobblestone",
153158
},
154159
{
155160
name: "dirt",
156161
image: "dirt",
162+
creator: "Dfass12",
157163
example: "dirt",
158164
},
165+
{
166+
name: "duck",
167+
image: "duck",
168+
creator: "Francescominciotti",
169+
example: "duck",
170+
},
159171
{
160172
name: "fabric",
161173
image: "fabric",
174+
creator: "Calebkimbrough",
162175
example: "fabric",
163176
},
164177
{
165178
name: "grass",
166179
image: "grass",
180+
creator: "zaphad1",
167181
example: "grass",
168182
},
169183
{
170184
name: "lava",
171185
image: "lava",
186+
creator: "zaphad1",
172187
example: "lava",
173188
},
174189
{
175190
name: "leaves",
176191
image: "leaves",
192+
creator: "zaphad1",
177193
example: "leaves",
178194
},
179195
{
180196
name: "marble",
181197
image: "marble",
198+
creator: "JustMeSupport",
182199
example: "marble",
183200
},
184201
{
185202
name: "metal",
186203
image: "metal",
204+
creator: "CopperScaleDragon",
187205
example: "metal",
188206
},
189207
{
190208
name: "paint",
191209
image: "paint",
210+
creator: "Walmarc04",
192211
example: "paint",
193212
},
194213
{
195214
name: "rug",
196215
image: "rug",
216+
creator: "geishaboy500",
197217
example: "rug",
198218
},
199219
{
200220
name: "sand",
201221
image: "sand",
222+
creator: "Sitges",
202223
example: "sand",
203224
},
204225
{
205226
name: "stone",
206227
image: "stone",
228+
creator: "Webtreats",
207229
example: "stone",
208230
},
209231
{
210232
name: "water",
211233
image: "water",
234+
creator: "Grendelkhan",
212235
example: "water",
213236
},
214237
{
215238
name: "wood",
216239
image: "wood",
240+
creator: "Webtreats",
217241
example: "wood",
218242
},
219243

0 commit comments

Comments
 (0)