AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 02:39:48 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,587 Commits 29 Branches 143 Tags
Commit Graph

4587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
cb433d3b01 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	build.properties
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/client/Textures.scala
	src/main/scala/li/cil/oc/common/PacketBuilder.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/tileentity/Charger.scala
	src/main/scala/li/cil/oc/server/agent/Player.scala
	src/main/scala/li/cil/oc/util/BlockPosition.scala
	src/main/scala/li/cil/oc/util/ExtendedWorld.scala
 2015-09-17 22:15:33 +02:00
Florian Nücke
9e4a22bb15 Merge branch 'sh-patch' of https://github.com/payonel/OpenComputers into master-MC1.7.10 2015-09-17 21:30:13 +02:00
Florian Nücke
9eebcce7d5 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-09-17 21:29:03 +02:00
Florian Nücke
8f3a0a5b66 Energy based, configurable (and potentially deadly) buff system: nanomachines! 
Also made Grog consumable, closing #410.
 2015-09-17 21:28:22 +02:00
Florian "Sangar" Nücke
23ac58c80a Merge pull request #1431 from makkarpov/patch-1 
Correct links in readme.md
 2015-09-17 17:55:27 +02:00
Maxim Karpov
085309587d Correct links in readme.md 2015-09-16 11:55:30 +03:00
payonel
da2c5ed305 Fix and improve the tab complete in sh 
use path as given by user in sh shell in tab completion, and do not show resolved path

don't add space to single directory completion in case user wants to add more directories

escape magic chars in possible hint handler from user input on command line
 2015-09-14 13:33:58 -07:00
Florian "Sangar" Nücke
217650e963 Merge pull request #1426 from cyber01/RU_doc 
Added transposer to manual index in RU
 2015-09-14 20:19:06 +02:00
cyber01
b4a632896e Added transposer to manual index in RU 2015-09-14 20:43:51 +04:00
Florian "Sangar" Nücke
f3e1aef16b Merge pull request #1424 from Vexatos/patch-25 
Added transposer to manual index.
 2015-09-14 16:36:55 +02:00
Vexatos
d63c1cfbe1 Added transposer to manual index. 2015-09-14 15:50:36 +02:00
Florian "Sangar" Nücke
2162f31d56 Merge pull request #1407 from chaoskagami/nek-fix-2 
Update to the proper final repo for NeK. Or so I hope, at least.
 2015-09-14 12:49:47 +02:00
Florian Nücke
9c27e85800 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala
	src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
 2015-09-13 13:30:24 +02:00
Florian Nücke
4e4e5d3ba3 Creative tablets won't run out of energy anymore... 2015-09-13 13:28:08 +02:00
Florian Nücke
db9b373d12 Fixed server racks and MCUs actually having a node on the front face that just was never used internally. 2015-09-13 13:27:48 +02:00
Florian Nücke
7617717390 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
 2015-09-11 18:20:49 +02:00
Florian Nücke
71cc2b8c7e Create environments for components in container slots on clients side, too... let's hope things don't blow up \o/ 2015-09-11 18:19:16 +02:00
Florian Nücke
f88af1fefc Oops. 2015-09-11 17:49:07 +02:00
Florian Nücke
3177431124 Should fix lighting issues when rendering tooltips. Closes #1350. 
Because apparently MC depends on the GlStateManager being broken... how could I have expected otherwise.
 2015-09-11 01:56:21 +02:00
Florian Nücke
b0950d73b2 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/inventory/Inventory.scala
	src/main/scala/li/cil/oc/common/tileentity/Hologram.scala
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
 2015-09-11 01:13:57 +02:00
Florian Nücke
13b89b6379 Added capability to arbitrarily rotate tier 2 holograms and set a rotation speed to auto-rotate them. Closes #1401. 2015-09-11 01:01:51 +02:00
Florian Nücke
2791308b17 Fixed the bloody time formatting once and for all. Probably. Closes #1413. 
Why did I not use the Calendar class in the first place? BECAUSE CHICKENS. Seriously, I don't even know anymore. That code was ancient.
 2015-09-10 22:32:25 +02:00
Florian Nücke
29d7746b26 Little more cleanup and homogenizing. 2015-09-10 20:51:07 +02:00
Florian Nücke
af49402d67 Likely proper implementation of IInventory.getStackInSlotOnClosing. 
Cleaned up and unified some inventory code, hopefully not breaking everything in the process...
 2015-09-10 20:50:21 +02:00
chaoskagami
27130ef44a Update to the proper final repo for NeK. Or so I hope, at least. 2015-09-07 21:58:54 -04:00
Florian Nücke
f8b9436f9c Version bump 2015-09-06 16:55:52 +02:00
Florian Nücke
dacc219984 Fixed potential dupe bug when having robots use ExU drums. 2015-09-06 16:54:29 +02:00
Florian Nücke
9c9ce8d4e5 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	build.properties
 2015-09-06 00:23:33 +02:00
Florian Nücke
d92f3ca9d8 Merge branch 'nek-fix' of https://github.com/chaoskagami/OpenComputers into master-MC1.7.10 2015-09-05 23:39:52 +02:00
Florian Nücke
d90325e6d5 Bump version. 2015-09-05 23:03:23 +02:00
Florian Nücke
8b53e9ddb2 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/item/HoverBoots.scala
 2015-09-05 23:03:02 +02:00
Florian Nücke
a0ce592382 Fixed crash when trying to change APU architecture. Closes #1404. 2015-09-05 23:00:09 +02:00
chaoskagami
38f30944f1 Fix for NeK maven being removed 2015-09-04 20:40:33 -04:00
Florian Nücke
81c2b7d1cc Avoid hover boots taking actual damage, subtract energy instead. Closes #1400. 
Also added slowness effect when running around with drained boots.
 2015-09-04 18:13:11 +02:00
Florian Nücke
78330ae428 Yay for resource loading being case sensitive in release but not in dev -.- 2015-08-30 18:07:51 +02:00
Florian Nücke
51e3f8166b Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-08-30 17:20:12 +02:00
Florian Nücke
0bc35468da Merge branch 'master' of https://github.com/magik6k/OpenComputers into master-MC1.7.10 2015-08-30 16:51:25 +02:00
Łukasz Magiera
3656ed941f
Fixed stderr not being passed in os.spawn in Plan9k 
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
 2015-08-30 16:50:15 +02:00
Florian Nücke
7042f7f87d Merge branch 'master' of https://github.com/magik6k/OpenComputers into master-MC1.7.10 2015-08-30 16:10:51 +02:00
Łukasz Magiera
06705e3891
Update plan9k 
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
 2015-08-30 15:28:49 +02:00
Florian Nücke
224ac94c3d Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/server/component/RedstoneWireless.scala
 2015-08-29 16:25:52 +02:00
Florian Nücke
e23378b662 Added setting to change delay enforced when changing redstone output. 2015-08-29 16:24:43 +02:00
Florian Nücke
e663127d39 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-08-29 16:05:58 +02:00
Florian "Sangar" Nücke
ee3d2696c9 Merge pull request #1393 from cyber01/RU_doc 
Added Transposer to Russian translation
 2015-08-29 16:05:21 +02:00
Florian Nücke
c36a22b9a3 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/integration/Mods.scala
	src/main/scala/li/cil/oc/integration/vanilla/ModVanilla.scala
	src/main/scala/li/cil/oc/util/InventoryUtils.scala
 2015-08-29 16:01:32 +02:00
Florian Nücke
931a04c61b Taking into account ISidedInventory.getAccessibleSlotsFromSide in InventoryUtils, because some inventories are... special. 
E.g. AgriCraft's Analyzer has getInventorySize = 2, but there are no slots 0 and 1, only slots 36 and 37 (or so; anyway, something way out of the range of to be expected valid indices).
 2015-08-29 15:55:38 +02:00
Florian Nücke
83ce705a99 Finished migrating crop stuff to Geolyzer/converter logic (mostly because I cba to make new graphics >_>). 
Also added AgriCraft API as JAR lib because getting the Gradle dep to work is a royal pita and I wasted too much time on trying that already...
 2015-08-29 15:10:44 +02:00
cyber01
a6988ed1ec Added Transposer 2015-08-29 15:58:46 +04:00
Florian Nücke
f41fe495b7 Merge branch 'farming_upgrade' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 
Started killing off upgrade stuff in favor of moving it into the geolyzer.

Conflicts:
	build.gradle
	build.properties
	src/main/scala/li/cil/oc/common/init/Items.scala
 2015-08-29 13:46:05 +02:00
Florian Nücke
a11b723d6e Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 2015-08-29 12:39:44 +02:00