Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-06-16 02:54:30 +02:00
Code Issues Projects Releases Wiki Activity
2545 commits 13 branches 0 tags 33 MiB
Commit graph

704 commits

Author SHA1 Message Date
Ellpeck
13351e498e Made the booklet always show the search bar and just put you into the all items section 2016-11-01 12:00:49 +01:00
Ellpeck
aa75418653 Added tiny coal to normal coal recipes 2016-10-31 21:06:10 +01:00
Ellpeck
ccab4bcee2 go away extra line~ 2016-10-31 20:56:32 +01:00
Ellpeck
6e7789b7b8 added reviews 2016-10-31 20:52:41 +01:00
Ellpeck
9a0698a907 Some JEI changes 2016-10-31 20:19:55 +01:00
Ellpeck
e538ab5cad Finished farmer 2016-10-31 19:03:04 +01:00
Ellpeck
8828b9c8a9 Farmer 2016-10-31 18:03:18 +01:00
Ellpeck
508ae87bdf Mining lens recipe and doc 2016-10-31 16:56:04 +01:00
Ellpeck
c0a40d03e7 Mining lens 2016-10-31 16:36:22 +01:00
Ellpeck
020adc97b2 Added back jam house loot and added lush caves loot 2016-10-30 23:08:40 +01:00
Wes Cook
0a7cd31119 Update en_US.lang (#306) 
Typos
 2016-10-28 16:00:01 +02:00
Ellpeck
23878da6fb make it clear the energy mode doesn't change anything 2016-10-22 02:37:28 +02:00
Ellpeck
3407aa61ba Added description to the booklet to explain what it is and that it needs to be right-clicked 2016-10-19 18:24:50 +02:00
xbony2
9c4019f8f1 corrected names (#264) 2016-09-28 16:42:17 +02:00
Ellpeck
1d77f1e168 Added a recipe to clear the oil generator's liquid storage 
Closes #253
 2016-09-25 20:57:43 +02:00
Ellpeck
ea982f025e Added textures for stuff that doesn't have any yet 2016-09-17 12:24:49 +02:00
Ellpeck
7b16833139 bio reactor recipe and doc 2016-09-17 12:12:59 +02:00
Ellpeck
51ebdc729f new oils doc 2016-09-17 12:03:03 +02:00
Ellpeck
f89196a701 Made solar panel lose efficiency with transparent blocks above it 
Closes #244
 2016-09-17 11:48:25 +02:00
Ellpeck
c4ef288653 added bio reactor 
Closes #234
 2016-09-14 21:42:03 +02:00
Ellpeck
820f097c12 Added recipe for empowered oil 2016-09-13 20:40:26 +02:00
Ellpeck
0853860810 Made the Lamp Controller toggle entire areas 
Closes #242
 2016-09-12 16:44:53 +02:00
Ellpeck
5311802085 Changed the color of the page buttons to be more visible 2016-09-12 15:09:55 +02:00
Ellpeck
9007ccadee Added crystallized canola seeds to make crystal oil 2016-09-11 14:51:52 +02:00
Ellpeck
015e5121e2 item distributor recipe and doc 2016-09-11 13:33:47 +02:00
Ellpeck
890a4b91ff what 2016-09-11 11:25:08 +02:00
Ellpeck
843aaf42c8 Added information to the booklet on how to remove a worm because of #240 2016-09-11 11:24:00 +02:00
Ellpeck
e580fd2219 Added item distributor 2016-09-09 21:43:33 +02:00
Ellpeck
9f314cf51d fluid laser relays recipe and doc 2016-09-08 17:34:54 +02:00
Ellpeck
12f4396264 Removed compatibility paxels 2016-09-05 21:52:29 +02:00
Ellpeck
4e2d2dd2a4 Finalize new Item Storage doc 2016-09-02 18:08:45 +02:00
Ellpeck
54999e0a81 Added an explanation via pictures to the item laser relay pages 2016-09-02 16:44:13 +02:00
Ellpeck
340d7cf780 Added different kinds of oils and made oil generator be able to use different types to create different amounts of RF. 
This basically closes #224
 2016-09-01 22:11:51 +02:00
Ellpeck
39baccc762 Added Fluid Laser Relays 2016-09-01 20:50:44 +02:00
BootyToast
130526b22e Tweaked fermenting barrel texture/model. 
New top texture.
 2016-08-17 22:31:20 -04:00
BootyToast
6b756a42f5 Slightly tweaked barrel texture. 
whoops.
 2016-08-17 11:44:30 -04:00
BootyToast
122229143a New fermenting barrel texture and model. 2016-08-17 11:25:59 -04:00
BootyToast
1d20798cd8 New canola press textures and model. 2016-08-17 09:28:53 -04:00
BootyToast
8fc9497175 Finished oil gen textures & model. 
Tweaked coal gen model.
 2016-08-17 08:34:14 -04:00
BootyToast
5fed8383fc New oil gen texture/model. 
Top texture not finished.
Need canola press,oil and coal generators set up for on/off textures.
 2016-08-14 05:40:08 -04:00
BootyToast
230c5a8743 Tweaked empowerer & display stand models. 2016-08-14 03:44:50 -04:00
Ellpeck
80ad0c9543 Made the XP solidifier pick up any XP orbs nearby 2016-08-12 22:02:20 +02:00
BootyToast
7ca7ce6949 Empowerer model tweak 2016-08-12 13:34:21 -04:00
BootyToast
0753c2492b New coal generator model 2016-08-12 12:56:00 -04:00
Ellpeck
1ac651ac6f Added the ability to put items back into the XP solidifier + made the storage crate not be a full block 2016-08-12 18:44:09 +02:00
BootyToast
1853ddf31b New empowerer, crates, wood casing textures/models. 
Crates are no longer full blocks.
Cleaned up blockstate files.
 2016-08-12 12:29:51 -04:00
Ellpeck
dca179fce4 Renamed bags like toast told me to 2016-08-10 13:32:55 +02:00
BootyToast
e4039d776e New bag & void bag textures. 
Suggestion - rename bag to "Traveler's Sack" & void bag "Void Sack."
 2016-08-10 01:47:59 -04:00
BootyToast
b1c5c55b29 New reconstructor, coal gen, & display stand textures/models. 2016-08-10 00:50:48 -04:00
tartaric_acid
301e9935bd Update zh_CN to R58 (#199) 
Update 3 language code
 2016-08-10 04:28:47 +02:00
Ellpeck
e900b00d3f Made coal generator rotate properly with the new texture 2016-08-10 00:09:32 +02:00
BootyToast
00edb13a77 New storage crate texture - bottom removed. 
New coal generator texture - new side texture.
New atomic reconstructor texture.
 2016-08-09 18:00:47 -04:00
Ellpeck
9295a66f28 Add info about transport from A to B to the Item Laser Relay chapter 2016-08-09 22:17:16 +02:00
Ellpeck
9c0fc504b7 Added bags-right-clicking-to-put-items-into-chests-feature. 
Closes #193
 2016-08-07 01:11:01 +02:00
Ellpeck
3976ceee86 If that one chinese guy translates this line as well I am going to officially announce that china is crazy 2016-08-07 00:08:41 +02:00
tartaric_acid
d35dadad6e Update zh_CN file (#192) 2016-08-06 18:04:07 +02:00
Ellpeck
4383c2768e Add another chieve that I thought was pretty cool 2016-08-06 17:50:54 +02:00
Ellpeck
af2ef37554 Made the booklet understand achievements properly 2016-08-05 13:38:13 +02:00
Ellpeck
f59e8f88e5 Turned some recipe ordering around in the booklet 2016-08-05 13:24:48 +02:00
tartaric_acid
308098d342 Update zh_CN file (#189) 
* Update zh_CN file

* fix a error
 2016-08-05 12:51:07 +02:00
Ellpeck
65aa7276ae Added some more achievements 2016-08-05 04:49:04 +02:00
Ellpeck
2a9a8ccbcc Added keep data recipes, made batteries keep their power, drills keep their upgrades and storage crates keep their content when crafted into further items 2016-08-04 11:57:35 +02:00
Ellpeck
f7d52a7178 Renamed the double furnace to powered furnace 2016-08-04 11:24:05 +02:00
Ellpeck
f949060d6f Removed Seasonal mode. 
Sorry :(
 2016-08-04 07:28:58 +02:00
Ellpeck
a907b7e8c5 Added more storage crate upgrades 
Closes #186
 2016-08-04 03:14:45 +02:00
Ellpeck
05b80abbb5 Creative Tab search bar, void bag, booty toast worm 2016-08-03 19:27:37 +02:00
Ellpeck
643f1a696f Empowerer and empowered crystals doc 2016-08-03 19:01:12 +02:00
Ellpeck
e323f960c5 changed and added recipes + empowerer texture 2016-08-03 17:59:27 +02:00
Ellpeck
9b7652e6bc honor the excellent 2016-08-03 16:02:40 +02:00
Ellpeck
4e2a1f71cd Merge remote-tracking branch 'origin/master' 2016-08-03 13:37:41 +02:00
Ellpeck
85de5de38f Empowering tweaks, empowered crystal textures 2016-08-03 13:36:42 +02:00
tartaric_acid
197fecf509 Update zh_CN file (#185) 
#1. Update some entries.
#2. fix a lot of errors.
 2016-08-03 12:48:56 +02:00
Ellpeck
b31875c38c Added a new crafting mechanic, the Empowerer 2016-08-03 04:01:47 +02:00
Ellpeck
d63c7e788d Finished bags. 
Closes #183
 2016-08-02 20:06:31 +02:00
Ellpeck
950b89a58c Added bags. 
They're awesome and super useful.
 2016-08-02 16:32:13 +02:00
Ellpeck
5993fa783c Added the priority info to the Item Laser Relay booklet entry 2016-08-02 03:17:49 +02:00
XDjackieXD
388123741c Changed capitalization. #ThingsWindowsCantHandle 2016-08-02 00:02:34 +02:00
Ellpeck
296816c0dc Changed the description of the introduction video page a bit 2016-07-26 23:02:42 +02:00
Ellpeck
2ce27f4735 Documented the battery change 2016-07-25 13:59:23 +02:00
Ellpeck
c166c3752d Made batteries output by sneak-right-clicking and added tesla support for items 2016-07-25 02:07:16 +02:00
Ellpeck
eeecb6c5cd Addons 2016-07-24 21:18:36 +02:00
Ellpeck
3bda990313 Added metadata and nbt toggles to everything that has a whitelist 2016-07-23 19:20:53 +02:00
Ellpeck
1fd25ec885 subtle worm changes 2016-07-22 22:52:18 +02:00
Ellpeck
205bb07c6b Finished worms. 
Closes #165
 2016-07-22 20:59:38 +02:00
Ellpeck
fdd4c295a4 WORMS! 2016-07-22 20:23:51 +02:00
Ellpeck
ab0c99cd0b do it regardless + tesla loc 2016-07-21 20:04:10 +02:00
Ellpeck
3df2868fe3 Added the ability to change between RF and Tesla display modes in machines 2016-07-21 18:35:38 +02:00
Ellpeck
3390a41a83 Finished the new energy and fluid displays~ 2016-07-21 13:22:55 +02:00
Ellpeck
5dc1951fa1 New energy and fluid displays, part 1! 2016-07-21 01:49:01 +02:00
Ellpeck
c31424944d Lens of Disenchanting recipe and doc 2016-07-20 11:16:27 +02:00
Ellpeck
4ef231efb6 Restructured book to have a reconstruction section 2016-07-20 11:03:56 +02:00
Ellpeck
b1d0a72c4f Added lens of disenchanting. 
Closes #161
 2016-07-20 10:42:41 +02:00
Ellpeck
76ef35da2e Player Probe recipe and doc and Energy Laser Relay recipes 2016-07-17 14:09:57 +02:00
Ellpeck
edf870403f Made Drill coloring not lose all of the NBT. 
Closes #153
 2016-07-17 13:27:20 +02:00
Ellpeck
2f9b6aa8f7 booklet now states that drill needs previous tiers 
Closes #155
 2016-07-17 12:59:23 +02:00
Ellpeck
be0270386e Added zh_CN.lang to 1.10.2 branch. 
Holy motherfreaking jesus, how do you do these things, people. Awesome thing.
 2016-07-17 12:48:59 +02:00
Ellpeck
64c152e8da Tiny Torch. 2016-07-14 22:04:24 +02:00
Ellpeck
a0a23b90c7 yoga 2016-07-14 18:12:09 +02:00
Ellpeck
07a9ae219b energy laser relay variation 2016-07-14 16:44:01 +02:00
Ellpeck
3d6ecda213 Renamed mashed food to bio mash 2016-07-14 12:53:27 +02:00
Ellpeck
fdfec92f24 Player Probe. 
Don't know if it works yet though.
 2016-07-14 02:11:41 +02:00
Glenthor
d06b12e163 -Changed BioMass and BioCoal Texures 2016-07-11 18:42:27 +02:00
Ellpeck
aae29bbfdc Apparently "Coffee Machine" is just a bad englishization from german. 2016-07-07 07:19:44 +02:00
Ellpeck
3cacb98968 Removed booklet stand crafting and doc. 
It's not supposed to be used in survival.
 2016-07-06 21:50:17 +02:00
Ellpeck
f540372c5a Credit where credit is due. 
Relates to #137
Dem feels tho.
 2016-07-06 21:06:37 +02:00
Ellpeck
b1f1102f94 Phantom Placer side rules 2016-07-06 20:05:56 +02:00
Ellpeck
15c8fcc244 Shock Suppressor texture, recipe and doc 2016-07-05 18:32:22 +02:00
Glenthor
980dc18085 Merge branch 'master' of https://github.com/Ellpeck/ActuallyAdditions 2016-07-04 22:29:22 +02:00
Glenthor
8ce95106b7 -Added ShockAbsorber 2016-07-04 22:29:07 +02:00
Ellpeck
a5e10de4b3 Changed the way tile entity registering and name rendering is handled 2016-07-03 21:57:33 +02:00
Ellpeck
8461ffea03 memes 2016-07-01 13:56:15 +02:00
Ellpeck
2c4bb5adca Larger crates recipe and doc 2016-06-27 20:34:58 +02:00
Ellpeck
925b259d8f Added medium and large storage crate 2016-06-27 20:19:04 +02:00
Ellpeck
73ff44851c Biomass and biocoal doc 2016-06-27 19:32:28 +02:00
Ellpeck
ee9c94da74 Added biomass and biocoal made from canola seeds and also made canola seeds edible 
Closes #130
 2016-06-27 19:25:46 +02:00
Ellpeck
7a26ae70df Updated logo and pictures~ 2016-06-18 01:04:25 +02:00
Ellpeck
6a80b6d988 Two new chieves 2016-06-17 23:37:01 +02:00
Ellpeck
cba94da5c5 Removed rarmor integration as the mod is being rewritten soon. 
Sorry. :v
 2016-06-17 14:54:53 +02:00
Ellpeck
b3cac0cadf Documented Tesla 2016-06-17 14:16:01 +02:00
Ellpeck
718c999f70 Added laser wrench mode switch. 
Closes #119
 2016-06-15 17:42:55 +02:00
Ellpeck
ac6cf7c3bc Added video introduction page 2016-06-12 13:39:26 +02:00
Ellpeck
3dbc31e264 Made coal and oil generator not randomly appear on even though they're not 2016-06-11 16:26:51 +02:00
Ellpeck
1b40bd3568 Only add things to smart item laser relay whitelist when they aren't on it yet 2016-06-10 17:53:11 +02:00
Ellpeck
a26db02ebe Changed ESD to allow higher numbers of slots and also have no limit on the max number to input so that you can basically make it pull from infinitely many slots if the amount of slots present is able to change 2016-06-10 13:57:52 +02:00
Ellpeck
63de88464b Filter and Display stand recipe and docs 2016-06-09 17:39:01 +02:00
Ellpeck
9a9ec02eef Added item filters 2016-06-07 23:17:06 +02:00
Ellpeck
5895a8de1c Added dispay stand and leaf blower and potion ring integration for it 2016-06-06 21:27:09 +02:00
Ellpeck
0b106526af Changed white- and blacklists in laser relays and ESDs to be for putting and pulling instead of both for both 2016-06-06 17:59:01 +02:00
Ellpeck
b65f0a7c76 Player Interface recipe and doc 2016-06-05 04:34:01 +02:00
Ellpeck
d66b53af9a Added Player Interface 2016-06-05 04:05:37 +02:00
Ellpeck
3f9ba0aa2f forgot this 2016-06-03 23:46:09 +02:00
Ellpeck
29db45553c Made tools be held like tools. 
Closes #96
 2016-06-03 23:45:02 +02:00
Ellpeck
e46851e789 Water bowl doc and config 2016-06-02 20:07:36 +02:00
Ellpeck
c53ea72404 Added water bowl 2016-06-02 19:28:51 +02:00
Ellpeck
c2c33412bf Where did that even come from..? 2016-05-30 23:57:02 +02:00
Ellpeck
4f69a02698 Update forge and fix addArmorMaterial. 
Closes #101
 2016-05-30 23:55:16 +02:00
Ellpeck
af67fb87cc Added view online button to booklet 2016-05-29 22:11:18 +02:00
Ellpeck
da0f071d58 Death tracking part 1 2016-05-27 18:54:17 +02:00
Ellpeck
c6b0ea9f98 Booklet stand model + bounding box 2016-05-26 14:59:48 +02:00
Ellpeck
796944d2ab Re-added booklet stand. 
Model and better bounding box to come.
 2016-05-26 13:11:43 +02:00
Ellpeck
b746ec5d03 Lush caves doc 2016-05-21 15:49:50 +02:00
Ellpeck
9b9f7b8ff3 Scrap this project. 
It doesn't fit the theme, it doesn't work like it should, it's broken to no end.
Yea, I'll probably do it some other time. Maybe.
 2016-05-21 12:21:36 +02:00
Ellpeck
b71af53d13 Reworked compost to accept custom recipes 2016-05-20 17:55:33 +02:00
Ellpeck
5cef7badac Removed Firework Box Minecart. 
Aaw :(
 2016-05-19 16:03:37 +02:00
Ellpeck
05f159f48a Made blocks in the cave world be determined by seed, added impure iron ore that spawns in cave world 2016-05-18 19:34:57 +02:00
Ellpeck
e20a82a4ad Firework Box Minecart! 2016-05-16 17:00:29 +02:00
Ellpeck
1df694c8e9 Added smart whitelist button to the whitelist laser relay that automatically adds items from adjacent chests to the whitelist 2016-05-14 13:13:35 +02:00
Ellpeck
1cdae3be7b Banner shields 2016-05-14 02:26:34 +02:00
Ellpeck
30d493d513 Add custom banner patterns 2016-05-13 23:19:30 +02:00
Ellpeck
a8717e6191 Changed some advanced laser relay functionality 2016-05-11 20:55:29 +02:00
Ellpeck
44ed2dcda1 Made some info on the item system clearer 2016-05-11 20:44:21 +02:00
Ellpeck
6e96964db8 Item viewer texture 2016-05-11 19:39:59 +02:00
Ellpeck
7a0ba8819d Item Storage recipes and doc 2016-05-11 19:30:19 +02:00
Ellpeck
c4a94a0724 Merge branch 'patch-7' of https://github.com/Kristian295/ActuallyAdditions 2016-05-10 22:31:22 +02:00
Ellpeck
ea1c65bbb3 Added whitelistable advanced item laser relays 2016-05-10 22:19:15 +02:00
Ellpeck
b4fde39a33 Item Phantom Networks, part 1 2016-05-08 21:09:58 +02:00
Ellpeck
9c40296db0 Spawner Shards + Spawner Changer recipe and doc 2016-05-08 14:11:24 +02:00
Ellpeck
c7f5455862 Spawner Changer 2016-05-08 02:55:59 +02:00
Ellpeck
89963a23fb Replaced bucket slots in GUIs with right click functionality 2016-05-06 23:23:29 +02:00
Ellpeck
f942810592 What did that even mean? 2016-05-06 18:38:56 +02:00
Ellpeck
3e6a18729d Reconstructor module recipe and doc 2016-05-06 16:29:49 +02:00
Ellpeck
f21fa7e317 Added Reconstruction Module as Rarmor integration 2016-05-06 16:11:26 +02:00
Ellpeck
d842367252 all teh moneyz 2016-05-06 10:55:51 +02:00
Ellpeck
6a0d4ca611 Redstoneface recipe and doc 2016-05-05 17:37:12 +02:00
Ellpeck
b6a02d8189 Added Phantom Redstoneface 2016-05-05 17:29:39 +02:00
Ellpeck
5b9f668d14 Made double furnace and double crusher use the double amount of energy if both items are smelting 2016-05-04 22:40:58 +02:00
Ellpeck
eb8b6cd06c Merge remote-tracking branch 'origin/master' 2016-05-04 17:48:05 +02:00
Ellpeck
ca91ef4d24 Added the ender star which is a new crafting ingredient 2016-05-04 17:47:54 +02:00
Ellpeck
78bfbc6208 Rename itemCrystalLightBLue.json to itemCrystalLightBlue.json 2016-05-04 16:36:43 +02:00
Ellpeck
0b9101398a Rename itemPotionRIng.json to itemPotionRing.json 2016-05-04 16:36:34 +02:00
Ellpeck
f50c9f32c1 fixed mcmod.info being broken 2016-05-03 22:12:16 +02:00
Ellpeck
af8356c9ef Fixed Fluid Placer not being able to place 2016-05-03 21:31:54 +02:00
Ellpeck
16c2c22cf7 Finished models 2016-05-03 21:26:02 +02:00
Ellpeck
15c65216cd Some more model work 2016-05-03 18:29:02 +02:00
Ellpeck
6e18866c79 Fixed equipment slot in energizer and enervator being off 2016-05-03 08:45:01 +02:00
Ellpeck
d6bc78fffb Started work on forge block models. 
Could still take a while though.
 2016-05-02 22:16:58 +02:00
Ellpeck
2599715973 Items are now held properly! \o/ 2016-05-02 16:42:04 +02:00
Ellpeck
a545eaa008 Fixed sounds 2016-05-01 22:26:26 +02:00
Ellpeck
08ea43e70d Fudge my life, 1.9 2016-04-20 21:39:03 +02:00
Ellpeck
2b12947e2c Changed Fake Player's name 2016-03-18 20:36:41 +01:00
canitzp
9afe9b5a8b Rename itemHoeCrystalblue.json to itemHoeCrystalBlue.json 2016-02-20 21:38:28 +01:00
canitzp
57c37cb900 Rewrite the SmileyCloud Renderer 2016-02-17 23:15:56 +01:00
canitzp
0600c56355 Reactivated AtomicReconstructor Lens Renderer 2016-02-17 21:45:19 +01:00
canitzp
b9262df154 Fixed the Tool JSONs 2016-02-17 20:32:02 +01:00
Ellpeck
c16629b470 Revert 5272d572be 2016-02-10 21:07:48 +01:00
Glenthor
5272d572be -Added Rounded Prism 2016-02-10 21:06:25 +01:00
Ellpeck
ef07e2d725 Revert #72. 
Text is too long for the pages.
 2016-02-09 18:29:48 +01:00
Kristian295
8caecdfd23 de_DE.lang : ll. 572 - 579 
Translated:
- booklet.actuallyadditions.chapter.intro.*
- booklet.actuallyadditions.chapter.craftingIngs.*
 2016-02-09 18:19:11 +01:00
Kristian295
d1924045c0 Translation of ll. 157-186, 429, 430 
yet untranslated lines:
572-773
 2016-01-29 23:53:29 +01:00
Kristian295
e312ce1f74 Matching de_DE.lang with en_US.lang 
yet untranslated lines:
157-186, 429-430, 572-773
 2016-01-29 23:14:03 +01:00
Ellpeck
8e7422df0f no 2016-01-23 12:20:06 +01:00
Ellpeck
8d59b01191 Changing some stuff to the tooltip CTRL thingy so that it looks nicer 2016-01-22 21:48:11 +01:00
Ellpeck
317978787c Added metadata and nbt to the Control info for ItemStacks 2016-01-22 19:40:00 +01:00
Ellpeck
223db4e04e Transmaterial Differentiator 2016-01-19 21:56:45 +01:00
Ellpeck
acc75f5313 ..fixed assets derping because of wrong capitalization 2016-01-18 21:38:18 +01:00
Ellpeck
59d835ed4f Added Coffee Machine JEI recipe 
Removed some stuff from the API that doesn't really belong there
 2016-01-17 12:17:24 +01:00
Kristian295
95970617f4 Molecular Transformilator 
Just added line 713 from en_US.

There will be more translating going on later this weekend!
 2016-01-15 23:08:16 +01:00
Ellpeck
ddc1ab7ce5 Molecular Transformilator 2016-01-15 22:05:36 +01:00
Ellpeck
352604aac1 Updated the stuff to the other stuff. 
In layman's terms: Made 1.8 the master branch.
 2016-01-13 21:48:48 +01:00
Patrick Walker
0629b53d30 Fixed texture name 2016-01-11 18:34:06 -05:00