Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-12-28 05:39:37 +01:00
Code Issues Projects Releases Wiki Activity
820 commits 15 branches 6 tags 33 MiB
Commit graph

747 commits

Author SHA1 Message Date
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
abf4202da8 Made Achievement Info work for entire chapters 2015-11-14 01:18:37 +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
7b9b88be78 Marzipan Smiley Cloud Kappa 2015-11-13 19:03:20 +01:00
Ellpeck
ed74026667 Fixed Blocks having an Item Renderer in the inventory 2015-11-13 18:56:15 +01:00
Ellpeck
9932432854 This is.. 
wow.
I'm...
wow.
/cc AtomSponge
 2015-11-12 21:36:20 +01:00
Ellpeck
a3b98937e8 r5 
I'm sorry.
 2015-11-12 20:11:27 +01:00
Ellpeck
0259e52fa1 Actually fixed Laser Relay Connection Issues 2015-11-12 20:06:58 +01:00
Ellpeck
093a69ed13 Made Laser Outputting less unnecessarily for-loopy 2015-11-12 17:56:57 +01:00
Ellpeck
3407b401a6 r4! 2015-11-11 22:10:29 +01:00
Ellpeck
ea9aee28db Hopefully fixed Laser Relay Connections sometimes breaking when quitting a world or server 2015-11-11 22:03:25 +01:00
Ellpeck
2ab300a9a5 Added character counter, just for teh lulz 2015-11-11 19:01:19 +01:00
Ellpeck
f9a9ee4dc6 Moving stuff from the booklet gui to a Util class so that it isn't that cluttered, added comments and explanatations 2015-11-11 18:51:20 +01:00
Ellpeck
d76156b78c Update Smiley Cloud Easter Eggs 2015-11-10 23:13:14 +01:00
Ellpeck
a104ef88aa Booklet Word Counter 2015-11-10 21:43:11 +01:00
Ellpeck
1209aa7d29 Misc Crusher Recipes 2015-11-10 21:26:28 +01:00
Ellpeck
fb73b2b568 Sloppy Crystal Textures (WHERE ARE YOU, PEOPLE THAT CAN ART) 2015-11-09 20:29:06 +01:00
Ellpeck
0540dadfc5 Crystals! 2015-11-09 18:05:52 +01:00
Ellpeck
1c99053f8d Drill + Torches = Instant 3x3 Mining? Nope! 2015-11-08 23:16:41 +01:00
Ellpeck
638186f975 Moved Villager Registring to PostInit because of OreDictionary Usage and stuffz 2015-11-08 19:45:34 +01:00
Ellpeck
e3261eba32 Walls. Lots of them. 2015-11-08 18:29:05 +01:00
Ellpeck
3572c4a4b5 AtomSponge Smiley Cloud 2015-11-06 23:22:38 +01:00
Ellpeck
8a6530d459 fml 2015-11-05 21:44:27 +01:00
Ellpeck
adddbfd2a0 r3! 2015-11-05 21:26:47 +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
Ellpeck
0577af4460 Fixed potential bug with booklet crafting page 2015-11-04 19:39:14 +01:00
Ellpeck
21af1b4be5 Some more Smiley Clouds 2015-11-03 23:47:17 +01:00
Ellpeck
184b0c9770 Fix toLowerCase stuff 2015-11-03 23:27:24 +01:00
Glenthor
5667e58b6c -Added blockBlackLotus 2015-11-03 20:59:40 +01:00
Ellpeck
d34d2040e7 Added Black Lotus to Creative Tab 2015-11-03 19:23:10 +01:00
Ellpeck
211d739445 Black Lotus World Spawning 2015-11-03 18:00:17 +01:00
Ellpeck
9456d40197 Black Lotus 2015-11-03 16:30:13 +01:00
Ellpeck
a56c1c32ed I know how to use methods I made for special occasions that I then don't use them for 2015-11-02 22:41:13 +01:00
Ellpeck
fad17a5b17 I might just move this to down here because some mods like to override vanilla blocks and items and I don't really like that for some reason or another 2015-11-02 22:37:44 +01:00
Ellpeck
b5e92b10b3 Changed the way Special People Overhead Rendering is handled 2015-11-02 21:38:49 +01:00
Ellpeck
988a27009a IntelliJ no IntelliJ y 2015-11-02 20:55:21 +01:00
Ellpeck
23853bd7f5 I don't know why I did this. 2015-11-02 20:47:14 +01:00
Ellpeck
0a21c048c4 Removed some seasonal stuff that didn't really work 2015-11-01 23:18:58 +01:00
Ellpeck
d42e2d2e4e Finally actually fixed some stuff 2015-11-01 10:34:17 +01:00
Ellpeck
62cc0a96ce Why does this annoy me so much? 2015-10-31 21:45:19 +01:00
Ellpeck
b24cd48984 Prevented Crash when the manual was open during a world crash or kick 2015-10-31 21:42:16 +01:00
Ellpeck
5e5173cf54 Fixed Heat Collector behaving stupidly 2015-10-31 17:14:56 +01:00
Ellpeck
42a6401c0d Fix Laser Relay Network. Damn it. 2015-10-31 15:21:50 +01:00
Ellpeck
9b536fc3d5 r2 2015-10-31 14:45:35 +01:00
Ellpeck
ae584fce2f Fix a Crash on Server with the Laser Relay /derp 2015-10-31 14:42:51 +01:00
Ellpeck
c753104586 Gave the Laser Relay an Energy Transfer Cap 2015-10-31 12:02:28 +01:00
Ellpeck
c6d14a25a4 Word in Search Bar gets saved between sessions 2015-10-30 23:37:20 +01:00
Ellpeck
e404bbf783 Removed Magnetic Miner 2015-10-30 23:24:49 +01:00
Ellpeck
96581ba7cf Added some Null Checks for stuffs 2015-10-30 21:42:14 +01:00
Ellpeck
7b9573ca8e Added Preview Pictures to the booklet (Thanks to Kitty for help!) 2015-10-30 20:07:36 +01:00
Ellpeck
80f9820f0d Fix Slab 2015-10-29 22:27:47 +01:00
Ellpeck
416ea1de02 Fixed Bug with Double Furnace & Double Crusher not crushing if both slots are filled /cc KittyVanCat 2015-10-29 21:52:31 +01:00
Ellpeck
d6dcb17e2a r1! 2015-10-29 21:27:56 +01:00
Ellpeck
caed3ead70 Remove Debug Print 2015-10-29 21:03:40 +01:00
Ellpeck
bf65cc4edb Made Laser Relay not output to the same block it got the energy from /cc Didi 2015-10-29 21:02:10 +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
Ellpeck
fc9a476763 Merge remote-tracking branch 'origin/master' 2015-10-29 19:51:22 +01:00
Ellpeck
c282d6a8ef Cleaned up NBT Data Saving 2015-10-29 19:51:00 +01:00
Glenthor
e6a50b2d36 -Added Iron Casing, Drill Core 2015-10-29 19:29:44 +01:00
Ellpeck
a7c8a3c6e4 Actually fixed Laser Network bugging sometimes for real now instead of thinking of stupid workarounds that don't really work 2015-10-29 17:36:30 +01:00
Ellpeck
c300b080f4 ~ 2015-10-29 15:04:34 +01:00
Ellpeck
41e2c7ce6a This is probably like punching any experienced programmer in the face, but it works. 2015-10-29 15:03:15 +01:00
Ellpeck
cb22c4aa94 Hopefully fixes ConcurrentModificationExceptions 2015-10-28 22:38:00 +01:00
Ellpeck
db31abb46b Creative Tab + Testing 2015-10-28 21:01: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
dc6e0b05be Bridging gap between old and new versions of Update Checker 2015-10-28 18:36:34 +01:00
Ellpeck
b1d070595b New Update Checker System & New Versioning! o/ 2015-10-28 18:28:30 +01:00
Ellpeck
3218b8b326 So much fix server 2015-10-28 14:46:04 +01:00
Ellpeck
1549882d3a Fix Server again 2015-10-27 23:09:23 +01:00
Ellpeck
7671b408c8 Fixed Server 2015-10-27 20:58:42 +01:00
Ellpeck
9661f9e817 Reverted Particle Range Change as it didn't work on servers and I can't really fix that right now 2015-10-27 20:40:33 +01:00
Ellpeck
c901a1fe05 Removed Pink Fluffy Unicloud Name because of serverz 2015-10-27 20:31:39 +01:00
Ellpeck
b8ba00ed83 Made Laser Particles render up to a range of 64 instead of the default 16 2015-10-27 20:28:48 +01:00
Ellpeck
fa424644c7 Added Laser Relay Particle Config Option 2015-10-27 08:16:36 +01:00
Ellpeck
ad5698dcd6 Phantomface Particles 2015-10-26 22:47:26 +01:00
Ellpeck
f520c87d94 Added Laser Relay Renderer. 
Differently than originally planned, but it works and looks nice.
Thanks to xdjackiexd though
 2015-10-26 22:28:49 +01:00
Ellpeck
0b3288d002 Merge pull request #18 from canitzp/master 
-Laser renderer
 2015-10-26 19:27:43 +01:00
Ellpeck
0c4413ad92 Remove unnecessary Config 2015-10-25 23:22:26 +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
canitzp
13faae85d4 -Colors for the Laser 2015-10-25 23:01:14 +01:00
canitzp
7859db2f74 -Deleted Baton 2015-10-25 22:22:05 +01:00
canitzp
6b58039721 -LaserRelay renderer 2015-10-25 22:16:54 +01:00
Ellpeck
713e9b6e1a Changed Creative Tab Handling a bit 2015-10-25 14:30:59 +01:00
canitzp
d021f502ea -Added Baton with Mob knockback 2015-10-25 02:54:01 +02: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
b8a1bca12c -Added Chocolate Toast 2015-10-24 21:13:06 +02:00
canitzp
83dbbd0dcb -Added Chocolate Toast 2015-10-24 20:56:27 +02:00
Ellpeck
f367c8fddd "You have turned Seasonal Mode off. Therefore, you are evil." 2015-10-24 12:18:42 +02:00
Ellpeck
156dee8a8b De-debugged Valentine's Day. 2015-10-23 23:09:46 +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
dc4fab5902 Whoops. 2015-10-23 19:06:40 +02:00
Ellpeck
7c1e589aa4 Added Booklet Priority Colors & Changed selection design 2015-10-23 19:05:02 +02:00
Ellpeck
5fa2925d8a Cleanuuup~ 2015-10-23 16:54:33 +02:00
Ellpeck
a6f989f45c Changed ItemBlock and Rarity Method because. 2015-10-23 16:48:56 +02:00
Ellpeck
247122c312 Made Laser Relay sit on walls when placed on them 2015-10-23 14:24:12 +02:00
Ellpeck
606a0d80a4 Fix PersistentClientData 2015-10-23 13:13:30 +02:00
Ellpeck
58454f25ed Made PersistentClientData less write-y 2015-10-22 22:58:52 +02:00
Ellpeck
4d082485e0 Moved server-side Player Data to WorldSaveData because ExtendedEntityProperties doesn't work properly 2015-10-22 22:18:33 +02:00
Ellpeck
2f0b73930e Always credit people, people! 2015-10-21 21:28:04 +02:00
Ellpeck
0caf82340d Laser relay Model 2015-10-21 21:00:52 +02:00
Ellpeck
91ef7537a3 Changed some more Laser stuff, rendering yet to come 2015-10-21 20:50:29 +02:00
Ellpeck
3aa005e659 More Laser Stuff Tweaks 
ToDo yet:
-Connection Rendering
-Go-through-walls preventing
 2015-10-21 19:14:57 +02:00
Ellpeck
d3ff196ec0 Tweaked Laser Wrench & Phantom Connector 2015-10-21 18:31:35 +02:00
Ellpeck
2d48931421 Merge pull request #16 from MineLoad/master 
Laser-Wrench Texture
 2015-10-21 18:05:28 +02:00
MineLoad
dae5bce066 Laser-Wrench 
+ added LaserWrench Texture
- remove Texture-Request
 2015-10-21 12:02:35 +02:00
Ellpeck
28ad2ae4d1 Changed WorldPos a bit 2015-10-21 06:56:40 +02:00
Ellpeck
3435bcf8e4 Added client syncing for lasers 2015-10-21 00:22:50 +02:00
Ellpeck
f045134434 Moar Lazor Relay fixez 2015-10-20 19:35:15 +02:00
Ellpeck
e7c8536a53 Made some quick Laser Relay fixes 2015-10-20 18:06:06 +02:00
Ellpeck
ab566297fa Added Laser Relay Functionality: 
-Connections & Networks
-Power Transfer

Yet to do:
-NBT Saving
-Graphics
 2015-10-20 00:22:36 +02:00
Ellpeck
1ae2515050 Before I forget 2015-10-19 17:52:53 +02:00
Ellpeck
b641977ec2 Added basic Laser Connection setup & World Storage 2015-10-19 17:50:43 +02:00
Ellpeck
09fd03f270 0.0.9.4! 2015-10-18 20:23:43 +02:00
Ellpeck
c9c0d2952a Added Seasonal Mode 2015-10-18 19:56:18 +02:00
Ellpeck
f036ed0a44 Start Work on Laser Relay 2015-10-18 19:21:32 +02:00
Glenthor
6dacc377cf -Updated guiBookletChristmas 2015-10-18 19:01:39 +02:00
Glenthor
a69b94bba0 Merge branch 'master' of https://github.com/Ellpeck/ActuallyAdditions 2015-10-18 18:43:52 +02:00
Glenthor
a7267b313c -Added Seasonal Textures 2015-10-18 18:42:54 +02:00
Ellpeck
3278cf9d3f Cleanup~ 2015-10-18 15:31:01 +02:00
Ellpeck
2c763c9199 Less stupid method of syncing changes to the client 2015-10-18 15:28:06 +02:00
Ellpeck
737dfb0770 Sooo.. someone really thought they needed to moan about crafting recipes being to expensive. So I'm nice about it. <3 2015-10-17 22:12:56 +02:00
Ellpeck
38bdab15fd Hopefully fixed PersistentServerData sometimes not remembering the data 2015-10-17 20:53:28 +02:00
Ellpeck
bf237a0782 Y U NO STACKSIZE 2015-10-17 16:03:26 +02:00
Ellpeck
75917782d2 Stopped the Crusher from adding recipes that don't actually have an input 2015-10-17 05:52:45 +02:00
Ellpeck
6f51795a01 Remove stuff 2015-10-16 22:34:58 +02:00
Ellpeck
b3f0a8fb1c Rearrangement, dö dö dööö 
Also: Letters that you might not have in your country
 2015-10-15 22:36:18 +02:00
Ellpeck
f3644de278 Update extra asset location (was making the mod file bigger even though it wasn't used in-game, duh) 2015-10-14 21:23:45 +02:00
Glenthor
96c1ef5dc9 -Added textures itemChestToCrateUpgrade, blockCraftyCrate, itemCrateToCraftyupgrade 2015-10-13 19:15:32 +02:00
Ellpeck
3f02d5cd0e Chest To Storage Crate Upgrade & Textures to be made 2015-10-13 18:48:44 +02:00
Ellpeck
a0b7a1cc3e Upped the RF Produced by the Leaf Generator 2015-10-13 05:59:30 +02:00
Ellpeck
f8da4c530c Fix Booklet Recipe Handler 2015-10-13 05:39:58 +02:00
Ellpeck
6ea6e175d7 New Intro Text (Thanks to Tulkas!) 2015-10-13 04:29:27 +02:00
Ellpeck
1a1c04d85a Fix booklet saving & opening of intro page 2015-10-13 03:43:41 +02:00
Ellpeck
ca90ce8dce Fixed last opened booklet page being opened agin: could've opened nothing and not have initialized the book sometimes 2015-10-13 03:13:39 +02:00
Ellpeck
65692d2eed Made Update info appear later 2015-10-13 02:12:55 +02:00
Ellpeck
c5f11fb380 Updated Update Checker 2015-10-13 02:12:30 +02:00
Ellpeck
1dbe79ac6f Cleanup~ 2015-10-12 23:27:36 +02:00
Ellpeck
cd1e323057 Made sense of comment 2015-10-12 04:31:35 +02:00
Ellpeck
fd5cf86cce Added Dispenser Handler for filling empty buckets with Mod Fluids 2015-10-12 04:30:14 +02:00
Ellpeck
e784ba1b86 Upped the Drill's Harvest Level & Config 2015-10-11 19:23:07 +02:00
Ellpeck
11e3517b54 Added Jam explanation to the booklet. /cc Hose + Kitty 2015-10-10 21:56:52 +02:00
Ellpeck
6ed25b330c Naming Conventions >__> 2015-10-10 20:17:34 +02:00
Ellpeck
0d8a684874 0093! 2015-10-10 16:30:45 +02:00
Ellpeck
23ae640286 Solar Panel & Heat Collector energy storage info 2015-10-10 15:29:02 +02:00
Ellpeck
4555edb18f Leaf-Eating Generator produces more 2015-10-10 15:18:00 +02:00
Ellpeck
ae6fc4ba33 Ranged Collector Localization, Crafting & Documentation 2015-10-10 03:39:42 +02:00
Ellpeck
02bc25c79b Seperated Phantomface TileEntities into seperate classes 2015-10-10 02:58:07 +02:00
Ellpeck
4b6b5c1cf2 Cleanup! 2015-10-10 02:52:53 +02:00
Ellpeck
e0e6bc8b4a Ranged Collector Mechanics 2015-10-10 02:51:06 +02:00
Glenthor
4118cd732a -Added textures for Directional Breaker and Ranged Collector 2015-10-09 19:43:52 +02:00
Ellpeck
8b0190cbbf Remove unused variables 2015-10-08 17:37:09 +02:00
Ellpeck
dd9e3cb08d Directional Breaker GUI 2015-10-08 05:11:24 +02:00
Ellpeck
2976887f24 MineLoad Smiley Cloud °~° 2015-10-07 20:47:28 +02:00
Ellpeck
6da52b5808 "That wouldn't be cheaty at all!" 2015-10-07 20:11:25 +02:00
Ellpeck
3474171df5 Didi Smiley Cloud 2015-10-07 00:55:19 +02:00
Ellpeck
aafb04cd09 Fix License 2015-10-06 16:36:25 +02:00
Ellpeck
6d54a09a68 Booklet page for the Precision Dropper 2015-10-06 12:40:13 +02:00
Ellpeck
446f122fee Long-Range Breaker Localization & Documentation 2015-10-05 19:55:28 +02:00
Ellpeck
486541c794 Directional (Advanced?) Breaker 2015-10-05 16:53:28 +02:00
Ellpeck
8d766ce83f Update Smiley Cloud Easter Eggs 2015-10-05 11:51:33 +02:00
Ellpeck
9dc5085fba Fixed items getting added to inventories, added horse armor -> raw materials crafting, leaf generator redstone control 2015-10-05 11:27:53 +02:00
Ellpeck
1590026ed3 Fix crash with EntityLivingEvent (for some reason) 2015-10-05 00:17:45 +02:00
Ellpeck
76d00af8a3 Added FrauBaerchen Smiley Cloud and fixed empty NEI Info Pages 2015-10-04 19:28:30 +02:00
Ellpeck
8896937cac Fix dot dot dot 2015-10-04 15:34:14 +02:00
Ellpeck
9b850658ff Added an NEI Handler for info in the booklet and removed "Press I"-Thing 2015-10-04 15:24:11 +02:00
Ellpeck
f42bf35372 Fixed some minor things 2015-10-04 13:21:07 +02:00
Ellpeck
cbaa8095e8 Added rf display to rf items 2015-10-04 02:32:40 +02:00
Ellpeck
61f920d2a6 Most useless commit ever 2015-10-04 00:21:03 +02:00
Ellpeck
4dc1d17c18 Fixed what I just did and crusher recipe handler for the booklet 2015-10-03 23:28:32 +02:00
Ellpeck
337f512afc Added KeyStates & better key handling 2015-10-03 23:07:44 +02:00
Ellpeck
0d9ab3bc0f Fixed intermodcomms 2015-10-03 22:19:04 +02:00
Ellpeck
df551d5518 Cleanup! 2015-10-03 22:13:57 +02:00
Ellpeck
21646c9c68 Rewrote Crusher Recipes 2015-10-03 22:09:53 +02:00
Ellpeck
e25c6c80dd Merge remote-tracking branch 'origin/master' 2015-10-03 22:01:57 +02:00
Ellpeck
69ff994375 Rewrote the crusher recipe handler to be better and more efficient and less buggy 2015-10-03 21:56:22 +02:00
Glenthor
88957ed0ca added leaf generator textures 2015-10-03 20:25:18 +02:00
Ellpeck
267546eff4 Fixed Optifine breaking the booklet text 
Closes https://github.com/Ellpeck/ActuallyAdditions/issues/14
 2015-10-03 19:19:26 +02:00
Ellpeck
4ede6fc608 More cleanup! 2015-10-03 10:19:41 +02:00
Ellpeck
8c0c2bb073 Cleanup 2015-10-03 10:16:19 +02:00
Ellpeck
23e23f5836 I is derp 2015-10-02 20:10:11 +02:00
Ellpeck
7e0d524b0f Fix nei recipe handlers 2015-10-02 20:06:03 +02:00
Ellpeck
a92396204a Re-added NEI recipe handlers, added button into nei handlers to show the item in question in the booklet 2015-10-02 19:58:03 +02:00
Ellpeck
9f4323bb0d cleanup 2015-10-02 16:48:01 +02:00
Ellpeck
42d6c39d14 U no testin' anymore, are ya? 2015-10-02 15:10:53 +02:00
Ellpeck
1de1bc8b83 Fixed Coffee Pages getting added to the pages that have ItemStack data 2015-10-02 14:46:13 +02:00
Ellpeck
d3d0178ef2 Renamed INameableItem to IActAddItemOrBlock just because 2015-10-01 23:20:31 +02:00
Ellpeck
e1af56faf2 Made the Config File and screen less ugly 2015-10-01 12:52:03 +02:00
Ellpeck
a7e63fc174 Leaf Generator booklet entry, crafting and localization 2015-10-01 12:11:38 +02:00