Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-23 15:48:34 +01:00
Code Issues Projects Releases Wiki Activity
1248 commits 14 branches 4 tags 33 MiB
Commit graph

381 commits

Author SHA1 Message Date
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
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
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