Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-12 03:19:09 +01:00
Code Issues Projects Releases Wiki Activity
1498 commits 14 branches 3 tags 33 MiB
Commit graph

439 commits

Author SHA1 Message Date
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
Patrick Walker
dbebafb1e5 Update itemSwordQuartz.json 2016-01-11 18:33:40 -05:00
Ellpeck
ed833be289 Finished 1.8.9 port for the most part. 
Some stuff to fix yet though.
 2016-01-10 19:32:21 +01:00
Ellpeck
a5c97e09bd Merge pull request #44 from canitzp/1.8 
More JSONs
 2016-01-10 17:34:15 +01:00
canitzp
c645a0e770 More JSONs 2016-01-10 17:00:07 +01:00
Ellpeck
3f165f897e ALL OF THE JSONS DONE. 
Now I just need to wait for canitzp to finish the special models~
 2016-01-10 15:29:45 +01:00
Ellpeck
390c1289f8 Merge pull request #43 from canitzp/1.8 
More JSONs
 2016-01-10 15:18:56 +01:00
canitzp
0cb9d6f8c9 More JSONs 2016-01-10 15:12:48 +01:00
canitzp
0b68b7e296 More JSONs 2016-01-10 15:12:20 +01:00
Ellpeck
860ef3d0ef Moooooar texture work ~ 2016-01-10 02:51:31 +01:00
Ellpeck
5e0e79d691 Some more texture work & fixing. 
Nothing special.
Well, lots of special stuff actually.
 2016-01-10 01:17:17 +01:00
canitzp
0f090df466 Merge remote-tracking branch 'origin/1.8' into 1.8 2016-01-09 18:37:52 +01:00
canitzp
15c03f2a43 FurnaceSolar/Solar Panel JSON 2016-01-09 18:37:30 +01:00
canitzp
f18dfa97c8 FurnaceSolar/Solar Panel JSON 2016-01-09 18:37:21 +01:00
Ellpeck
bca7812097 Merge pull request #40 from canitzp/1.8 
-Coffee Machine JSON \o/
 2016-01-09 18:08:42 +01:00
canitzp
8efe5482f8 -Coffee Machine JSON \o/ 2016-01-09 18:07:18 +01:00
Ellpeck
4ed17950b9 Removed TESRs for the most part and added a "not complete"-disclaimer for the upcoming 1.8.9 beta releases ~ 2016-01-09 17:53:06 +01:00
Ellpeck
61b921b2dd Some more texture work. 
Done for now.
Hahah.
Good joke.
 2016-01-09 14:35:04 +01:00
Ellpeck
fec10edbc2 Loooots more texture work. 
Okay, I'm done for today.
 2016-01-09 02:36:43 +01:00
Ellpeck
2babb6cf0b Some more texture work, fixed Special Render for items 2016-01-09 00:04:30 +01:00
Ellpeck
8f959c92aa More Fixes °~° 
Continuing some other time.
 2016-01-08 21:55:39 +01:00
Ellpeck
51872bbc23 Dis game is ass - More textures 2016-01-08 20:51:03 +01:00
Ellpeck
77860267da ITEMS AND BLOCKS RENDER 
Well.
Not all of them.
 2016-01-08 17:25:31 +01:00
Ellpeck
c08d2221fa This doesn't work. 2016-01-08 16:52:53 +01:00
Ellpeck
c0a6ee8f85 Bacon recipe & doc. 
Why am I doing this to myself.
 2016-01-04 17:34:06 +01:00
Ellpeck
5bd1926453 Added bacon 2016-01-04 17:25:03 +01:00
Ellpeck
4cecbc491e "Light Black"? What's that supposed to be? 2016-01-03 23:21:52 +01:00
Glenthor
260978bc53 -Added Crystal Tools and Armor 2016-01-03 23:16:41 +01:00
Ellpeck
8f3b58a730 MOAR PAXELS 2016-01-01 23:44:22 +01:00
Ellpeck
a071008059 Fix new tools/armor not being named correctly 2016-01-01 23:04:22 +01:00
Ellpeck
c10a91da29 SO MANY NEW ITEMS 
ITS ALL TOOLS AND ARMOR OMG
 2015-12-31 15:05:27 +01:00
Ellpeck
7215a7cd80 Product placement. 
Still less annoying than Reika's Update Checkers.
 2015-12-30 23:17:03 +01:00
Ellpeck
25c52823c5 Ignore Mappings for missing itemSpecial, it's removed on purpose. 2015-12-28 15:07:21 +01:00
Ellpeck
a64991b75f Removed Special Drops and added Solidified Experience as own item 2015-12-28 15:05:56 +01:00
Ellpeck
317bfa1de5 Booklet Info for Miner's Range 2015-12-27 15:57:14 +01:00
Ellpeck
448a050c26 Removed Stone Casing 2015-12-26 23:48:49 +01:00
Glenthor
6c3415864c -Reworked some texures 2015-12-26 20:43:24 +01:00
Glenthor
68a994a4b6 -Reworked some textures 2015-12-26 20:41:47 +01:00
Ellpeck
1e1cd533b0 Why was that there? 2015-12-26 18:25:13 +01:00
Ellpeck
2ad42eda45 tifisgrin 2015-12-26 18:22:49 +01:00
Ellpeck
b51c67fa6c Disclaimer for noobs 2015-12-26 18:13:28 +01:00
Ellpeck
ac8f8499d2 Jam House Info Page 2015-12-25 21:56:10 +01:00
Ellpeck
6a7920c9d9 Revert Texture changes for update 2015-12-24 23:26:50 +01:00
Glenthor
da88d898b7 -Reworked some textures 2015-12-23 18:24:09 +01:00
Ellpeck
8b20fc066e Removed World from WorldPos, renamed it to Position. 
That fixed loads of issues.
 2015-12-23 01:43:49 +01:00
Ellpeck
1806cd1820 Removed Green Dye Icon 2015-12-22 15:26:30 +01:00
Ellpeck
7ef84608fa Removed green dye. 
No one used it anyways.
Even I forgot it existed.
 2015-12-22 15:23:19 +01:00
Ellpeck
a5a3114b4a Added a Disclaimer to the Phantomface chapter because I was annoyed that people call it "Short-Range Tesseract" 2015-12-19 11:39:46 +01:00
Ellpeck
4634b4cd2c Added a page to the booklet explaining Redstone Flux 2015-12-19 10:11:11 +01:00
Ellpeck
11935c0698 Firework Box reacts to redstone torch mode changing now 2015-12-18 16:25:12 +01:00
Ellpeck
222cac8e74 Made Reconstructor react to redstone mode changing 2015-12-18 16:22:39 +01:00
Ellpeck
f26f9ddbb2 New Booklet Main Page Design 2015-12-17 21:58:59 +01:00
Ellpeck
09135e72b6 Black Quartz decor blocks 2015-12-17 20:18:22 +01:00
Ellpeck
6952588510 Docs for the redstone change 2015-12-17 18:58:09 +01:00
Ellpeck
f0710eaa8b Crate Keeper recipe, loc and doc 2015-12-16 15:45:01 +01:00
Glenthor
7cb3da62ed -Added FireworkBox textures 2015-12-13 21:12:00 +01:00
Ellpeck
66ee9e1ba4 Firework box localisation & creative tab 2015-12-13 17:46:31 +01:00
Ellpeck
028d8a9612 Firework Box Crafting & Docs 
(it rhymes!)
 2015-12-13 17:43:35 +01:00
Ellpeck
6fe1948d0d Crusher, Coffee Machine & Reconstructor Sounds! 2015-12-13 14:36:34 +01:00
Ellpeck
e59c41b20d Added HoMeCo-Jam 2015-12-10 14:38:12 +01:00
Ellpeck
7e4eedfae8 Miner Doc 2015-12-09 20:59:10 +01:00
Ellpeck
af9ba15c34 Miner done! 
Woop-da-doop
 2015-12-09 20:24:45 +01:00
Ellpeck
508b488405 More work on the miner. Now has a "Only Mine Ores"-mode 2015-12-09 18:47:42 +01:00
Ellpeck
2cac51952b More chieves 2015-12-09 15:47:57 +01:00
Ellpeck
80434f4e6d Started on miner. 
Doesn't actually do anything yet though.
 2015-12-06 02:16:52 +01:00
Ellpeck
74b627ac4b Fixed a load of little bugs that were put in when I changed the stuffz 2015-12-05 16:00:11 +01:00
Ellpeck
32a42643c9 Added better mouse controls to the booklet 2015-12-04 19:53:55 +01:00
Ellpeck
40191b840a Made the Color Lens use energy & Added NEI Recipes for the color conversion recipes & Changed booklet pages a bit 2015-12-04 12:59:37 +01:00
Ellpeck
97c948828a Fix Lamp textures 2015-12-03 22:53:05 +01:00
Ellpeck
a86389d2b2 I should never have done this 2015-12-02 22:31:50 +01:00
Ellpeck
0acad26335 Green Dye texture 2015-12-02 19:22:24 +01:00
Ellpeck
910a1e7fbe Removed unnecessary things from the OreDictionary by adding recipes for the Reconstructor and the Crusher that don't use it. 
Also added green dye.
 2015-12-01 23:23:55 +01:00
Ellpeck
722b634f5f Tweaked Drill naming 
Also: THIS IS NOT YELLOW.
 2015-12-01 19:16:29 +01:00
Glenthor
07bb202d79 -Added Coloured Drills 2015-12-01 18:35:50 +01:00
Ellpeck
b57c8f03b9 Colorable Drills~ 2015-12-01 18:27:40 +01:00
Ellpeck
f22d6ddfae Rotten Flesh -> Leather 2015-11-29 00:31:04 +01:00
Ellpeck
37a08aeab7 Lens of certain death 2015-11-28 19:30:24 +01:00
Ellpeck
61ab865eb8 Reorganized the booklet a bit 2015-11-28 17:53:16 +01:00
Ellpeck
c545b162ff Adjusted Reconstructor explosion lens values, texture 2015-11-27 17:00:58 +01:00
Ellpeck
7cb73187c4 Added Explosion Lens 2015-11-27 15:57:38 +01:00
Ellpeck
f35779db64 lolwuthowudodis 2015-11-26 20:45:55 +01:00
Ellpeck
2e312db996 Fixed & Changed Reconstructor Recipe Handler a bit, restructured Reconstructor's main booklet page 2015-11-25 22:13:51 +01:00
Ellpeck
33a5480e27 Fixed a bug where Items would be deleted when exiting the booklet 
Fixes https://github.com/Ellpeck/ActuallyAdditions/issues/21
 2015-11-25 19:59:58 +01:00
Ellpeck
5344daae1e Removed bookmark buttons for Booklet Stand 2015-11-24 21:45:03 +01:00
Ellpeck
52bc9660d3 Booklet Stand Recipe & Docs 
(this is for you, BTM16)
 2015-11-24 20:19:27 +01:00
Ellpeck
8a40cf9e15 Booklet Stand 2015-11-24 19:59:33 +01:00
Ellpeck
f1b54529e6 Removed german lang file as it's neither getting updated, nor used. 
If you want to make a new one, feel free to, just submit a pull request.
 2015-11-23 19:18:46 +01:00
Ellpeck
60ad0b1caa Made Text for bugged items less dumb 2015-11-23 19:06:07 +01:00
Ellpeck
6b27b651ae Added Cycle Recipes for wool, stained clay and glass 2015-11-22 22:31:09 +01:00
Ellpeck
e5850ffb4e Fixed some stuff regarding the Reconstructor 2015-11-22 22:17:42 +01:00
Ellpeck
ba1858af69 Color Conversion, Lens Textures, Localization & Documentation 2015-11-22 21:00:05 +01:00
Ellpeck
0a78782693 Reconstructor Colors, Part 1 2015-11-22 18:52:11 +01:00
Ellpeck
f394f74882 never mind 2015-11-22 01:22:50 +01:00
Glenthor
7fd8fabe80 -Added blockLens texture 2015-11-22 01:16:18 +01:00
Ellpeck
9becd9b3e2 Misc. Reconstructor Recipes, "added" Ethetic Quartz Blocks and made them craftable 2015-11-20 22:25:04 +01:00
Glenthor
5108438364 -Updated green and white wall textures 2015-11-20 22:16:03 +01:00
Ellpeck
a1c852fba2 Atomic Reconstructor uses energy depending on recipe 2015-11-20 21:21:21 +01:00
Ellpeck
11e2326cae Made ActAdd Fluid Names not clash with other mods' ones 2015-11-19 16:39:09 +01:00
Ellpeck
98ba5566a3 Better Damage Descriptions 2015-11-19 15:26:54 +01:00
Ellpeck
86dd3978f7 Changed Booklet Colors and Placings around a bit, added Manual Help Page 2015-11-16 22:21:29 +01:00
Ellpeck
e4f16e8a68 Changed Bookmark Texture 2015-11-16 20:46:41 +01:00
Ellpeck
3ff1c50454 Added Bookmarks 2015-11-16 19:57:46 +01:00
Ellpeck
4d1dffb714 Made background graphic for current chapter name 2015-11-16 19:03:29 +01:00
Ellpeck
1d6854b98f Automation Tutorial for Atomic Reconstructor 2015-11-16 17:45:36 +01:00
Ellpeck
77dd51838c r6! 2015-11-15 19:49:50 +01:00
Ellpeck
ec1f746ca1 Add Dungeon Loot 2015-11-15 19:24:36 +01:00
Ellpeck
4cc08f43fe Manual description & Purple Drill (/cc xdjackiexd) 2015-11-15 19:02:18 +01:00
Ellpeck
2902f5d8a5 Many recipes now use Crystals, fixed Reconstructor Page & Chapter, moved pages around 2015-11-15 17:50:31 +01:00
Ellpeck
377126e2ba Fix Reconstructor Recipe Page 2015-11-15 15:25:06 +01:00
Ellpeck
717aa87566 Reconstructor Crafting, Documentation & Recipe Handler for Booklet 2015-11-15 15:15:32 +01:00
Ellpeck
623a8594e1 Atomic Reconstructor Particles & Damage 2015-11-15 14:25:12 +01:00
Ellpeck
2be8b18d71 Fixed Atomic Reconstructor Recipes, added Item Support & textures! 2015-11-14 23:05:20 +01:00
Ellpeck
db3abb0f05 Crystal textures~ 2015-11-14 21:29:24 +01:00
Ellpeck
fbd869dc7b Added Atomic Reconstructor, made it function (Still needs particles etc. though) 2015-11-14 21:27:36 +01:00
Ellpeck
50f2dbba0d Added Emerald Drill + Fixed NEI Booklet Handler ignoring meta items 2015-11-14 14:30:35 +01:00
Ellpeck
89a2fa20d3 Achievement Information in the booklet 2015-11-13 21:40:38 +01:00
Ellpeck
b0d920a159 New Cheeves! (More to come!) 2015-11-13 20:34:57 +01:00
Ellpeck
2ab300a9a5 Added character counter, just for teh lulz 2015-11-11 19:01:19 +01:00
Ellpeck
a104ef88aa Booklet Word Counter 2015-11-10 21:43:11 +01:00
Ellpeck
fb73b2b568 Sloppy Crystal Textures (WHERE ARE YOU, PEOPLE THAT CAN ART) 2015-11-09 20:29:06 +01:00
Ellpeck
e3261eba32 Walls. Lots of them. 2015-11-08 18:29:05 +01:00
Ellpeck
b77fe5a31c Reverts~ 2015-11-04 20:15:12 +01:00
Glenthor
d4038d34c0 -Updated itemBooklet 2015-11-04 20:07:24 +01:00
Glenthor
330c0499e6 Updated itemBooklet 2015-11-04 19:57:01 +01:00
Glenthor
5667e58b6c -Added blockBlackLotus 2015-11-03 20:59:40 +01:00
Ellpeck
9456d40197 Black Lotus 2015-11-03 16:30:13 +01:00
Ellpeck
b5e92b10b3 Changed the way Special People Overhead Rendering is handled 2015-11-02 21:38:49 +01:00
Ellpeck
0a21c048c4 Removed some seasonal stuff that didn't really work 2015-11-01 23:18:58 +01:00
Ellpeck
e404bbf783 Removed Magnetic Miner 2015-10-30 23:24:49 +01:00
Ellpeck
7b9573ca8e Added Preview Pictures to the booklet (Thanks to Kitty for help!) 2015-10-30 20:07:36 +01:00
Ellpeck
d6dcb17e2a r1! 2015-10-29 21:27:56 +01:00
Ellpeck
4c6d76d82e Added Iron Casing & Drill Core 2015-10-29 20:54:10 +01:00
Ellpeck
1ccf136be6 Fix Typo /cc Didi 2015-10-29 19:54:05 +01:00
Glenthor
e6a50b2d36 -Added Iron Casing, Drill Core 2015-10-29 19:29:44 +01:00
Ellpeck
95361fcde5 Added Laser Relay Crafting & Documentation, added Chest To Crate Upgrade Documentation & Crafting, Config Stuff 2015-10-28 20:35:39 +01:00
Ellpeck
b1d070595b New Update Checker System & New Versioning! o/ 2015-10-28 18:28:30 +01:00
Ellpeck
c901a1fe05 Removed Pink Fluffy Unicloud Name because of serverz 2015-10-27 20:31:39 +01:00
Ellpeck
c88575e151 New AIOT Textures 2015-10-25 23:19:17 +01:00
Ellpeck
c494edc88b Added SimpleOres AIOTs 2015-10-25 23:19:01 +01:00
Ellpeck
4131198835 Textures! 2015-10-24 21:20:47 +02:00
Ellpeck
6acfea1b32 Fix Chocolate Toast 2015-10-24 21:20:27 +02:00
canitzp
83dbbd0dcb -Added Chocolate Toast 2015-10-24 20:56:27 +02:00
Ellpeck
f8529cb878 Added Valentine's Day Seasonal. You might consider not playing between the 12th and the 16th of Feb. 2015-10-23 23:08:53 +02:00
Glenthor
cbe54459a1 -Added guiBookletValentinesDay 2015-10-23 22:59:14 +02:00
Ellpeck
50cc49dd10 More seasonal easter eggs 2015-10-23 22:38:12 +02:00
Ellpeck
dcf9766243 Changed Ball Of Hair Name to "Ball of Fur", added Booklet Page 2015-12-17 22:18:37 +01:00
Ellpeck
7c1e589aa4 Added Booklet Priority Colors & Changed selection design 2015-10-23 19:05:02 +02:00