Commit Graph
3623 Commits
Author SHA1 Message Date
Vincent Lee 750276db9b Merge upstream 2015-11-17 01:07:15 -06:00
Vincent Lee 58dbb0f9cf Lenses, materials, records, relics, equipment 2015-11-17 01:03:09 -06:00
Vincent Lee 6fb9b0101e Some entities 2015-11-17 00:30:32 -06:00
Vincent Lee 3b8926c24b Easy stuff in common.core 2015-11-16 16:37:03 -06:00
Vasco Lavos 4b5e02b1ac Recipe/docs for the new lens 2015-11-16 21:51:52 +00:00
Vincent Lee bbbe93a8de common.lexicon 2015-11-16 13:40:19 -06:00
Vincent Lee 9da9d61880 break from client for now 2015-11-16 13:35:58 -06:00
Vincent Lee 29e42d86ea Some of client.render.tile 2015-11-16 13:15:32 -06:00
wiiv 4800ac48a9 Less Techy? 2015-11-16 16:21:38 +00:00
Vasco Lavos 522740a893 Tweaked manaweave armor model 2015-11-16 15:37:24 +00:00
Vasco Lavos 45c2724a6b Fixed the Redirective lens redirecting if fired from a blaster 2015-11-16 15:26:21 +00:00
Vasco Lavos 9c25373dc8 Agricarnations are now quieter. 2015-11-16 15:25:59 +00:00
Vasco Lavos 576a6233af Merge branch 'master' of https://github.com/Vazkii/Botania 2015-11-16 15:11:08 +00:00
Vasco Lavos 0773fd7af6 This name is far more accurate. 2015-11-16 15:10:56 +00:00
wiiv eadeea0b92 Armor texture tweaks. 2015-11-16 02:24:00 +00:00
wiiv c0d13a1507 Mana detectors, now with color. 2015-11-15 23:42:34 +00:00
wiiv 0e3d3817b0 New Stuff Galore! 2015-11-15 23:08:05 +00:00
Vasco Lavos 7f7fa4cc98 Fixed botania Panes having weird lighting in corners. 2015-11-15 22:01:32 +00:00
Vasco Lavos 3fa9ca216d New Lenses (part 3) 2015-11-15 22:01:09 +00:00
Vasco Lavos 5f8c650fa2 New Lenses (part 2) 2015-11-15 20:57:06 +00:00
Vasco Lavos 7c9084eab2 New Lenses (part 1) 2015-11-15 19:49:12 +00:00
Vasco Lavos f1193e8af6 Fixed Entropic Mana Lenses exploding if in contact with a full mana spreader 2015-11-15 19:23:56 +00:00
Vasco Lavos 414249919e Bellethrones can now kill witches properly 2015-11-15 18:36:28 +00:00
Vasco Lavos dfcaddab3c Made luminizers quieter 2015-11-15 18:29:18 +00:00
Vasco Lavos d8415a8282 Finalize scp upload 2015-11-15 15:46:27 +00:00
Vasco Lavos b82b4e5be1 More work on scp uploading 2015-11-15 15:35:03 +00:00
Vasco Lavos 97af8c9016 Merge branch 'master' of https://github.com/Vazkii/Botania 2015-11-15 15:14:49 +00:00
Vasco Lavos 2975915233 Change gradle upload from FTP to SCP. Untested, will probably explode horribly. 2015-11-15 15:14:36 +00:00
Vincent Lee 88ca096ae0 client.gui.lexicon 2015-11-14 19:48:26 -06:00
Vincent Lee b07cac07a0 Fix the ctors oops 2015-11-14 15:50:23 -06:00
Vincent Lee afb9650b12 Update EntityThrowableCopy to 1.8 ver 2015-11-14 15:49:58 -06:00
Vincent Lee a1c3b00ae0 client.core.fx 2015-11-14 12:28:02 -06:00
Vincent Lee b22e485217 Some of client.core.handler. Most of this will need to be migrated to layerrenderers 2015-11-14 12:21:30 -06:00
Vincent Lee 7ad1820fcb Low hanging fruit: core.world, core.network, core.lib, core.crafting, some miscs 2015-11-14 00:59:47 -06:00
Vincent Lee 8591551a1b Lots of tessellator substitutions, full findreplace from CC to BlockPos. Some low hanging fruit in client 2015-11-14 00:39:42 -06:00
Vincent Lee 4d674da1b7 Most of what I can do with API done. 2015-11-14 00:28:00 -06:00
Vincent Lee d293a7dcc7 update readme 2015-11-13 20:22:39 -06:00
Vincent Lee 920324b135 Much of the API (blockpos and enumfacing, some low hanging fruit). Not done with it yet though. 2015-11-13 20:19:29 -06:00
Vincent Lee 67d5d65902 Shotgun tile.getWorldObj into tile.getWorld. May cause some individual errors but fix later 2015-11-13 19:53:37 -06:00
Vincent Lee f6cfeedd1d Vec3 and AABB factory to plain ctor 2015-11-13 19:51:23 -06:00
Vincent Lee 5a11a58346 cpw.mods.fml to net.minecraftforge.fml 2015-11-13 19:50:23 -06:00
Vincent Lee da2e5dfa51 Update build.gradle 2015-11-13 19:49:41 -06:00
Vasco Lavos 683ae951c3 Update contributing.md 2015-11-13 13:00:27 +00:00
Vasco Lavos d32b47b971 Merge pull request #1543 from MatthiasMann/master
avoid unnecessary object allocation
2015-11-13 12:58:43 +00:00
Matthias Mann ab633fb419 avoid unnecessary object allocation 2015-11-13 09:03:54 +01:00
Vasco Lavos cf26ce2f2b Build 233 2015-11-12 23:33:48 +00:00
Vasco Lavos c1e697feb7 Fixed items that take damage when used in a crafting recipe taking damage purely by being put in the grid. Closes #1458 2015-11-12 23:26:33 +00:00
Vasco Lavos afdf57e070 Save current texture before using the lexica botania shader and rebind it afterwards. Closes #1533 2015-11-12 23:16:23 +00:00
Vasco Lavos 6c88006941 Build 232 2015-11-11 22:23:09 +00:00
Vasco Lavos 314488248f Using Phantom Ink on an item that already has it will now remove it. 2015-11-11 22:17:05 +00:00